Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.3] Add cc emails in mail notifications #16152

Merged
merged 2 commits into from
Oct 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Illuminate/Notifications/Channels/MailChannel.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ public function send($notifiable, Notification $notification)
$m->to($recipients);
}

if ($message->cc) {
$m->cc($message->cc);
}

$m->subject($message->subject ?: Str::title(
Str::snake(class_basename($notification), ' ')
));
Expand Down
20 changes: 20 additions & 0 deletions src/Illuminate/Notifications/Messages/MailMessage.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ class MailMessage extends SimpleMessage
*/
public $to = [];

/**
* The "cc" recipients of the message.
*
* @var array
*/
public $cc = [];

/**
* The attachments for the message.
*
Expand Down Expand Up @@ -98,6 +105,19 @@ public function to($address)
return $this;
}

/**
* Set the recipients of the message.
*
* @param string|array $address
* @return $this
*/
public function cc($address)
{
$this->cc = $address;

return $this;
}

/**
* Attach a file to the message.
*
Expand Down
40 changes: 40 additions & 0 deletions tests/Notifications/NotificationMailChannelTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,37 @@ public function testMessageWithToAddress()
$channel->send($notifiable, $notification);
}

public function testMessageWithToCcEmails()
{
$notification = new NotificationMailChannelTestNotificationWithCcEmails;
$notifiable = new NotificationMailChannelTestNotifiable;

$message = $notification->toMail($notifiable);
$data = $message->toArray();

$channel = new Illuminate\Notifications\Channels\MailChannel(
$mailer = Mockery::mock(Illuminate\Contracts\Mail\Mailer::class)
);

$views = ['notifications::email', 'notifications::email-plain'];

$mailer->shouldReceive('send')->with($views, $data, Mockery::on(function ($closure) {
$mock = Mockery::mock('Illuminate\Mailer\Message');

$mock->shouldReceive('subject')->once();

$mock->shouldReceive('to')->once()->with('[email protected]');

$mock->shouldReceive('cc')->once()->with(['[email protected]', '[email protected]']);

$closure($mock);

return true;
}));

$channel->send($notifiable, $notification);
}

public function testMessageWithPriority()
{
$notification = new NotificationMailChannelTestNotificationWithPriority;
Expand Down Expand Up @@ -318,6 +349,15 @@ public function toMail($notifiable)
}
}

class NotificationMailChannelTestNotificationWithCcEmails extends Notification
{
public function toMail($notifiable)
{
return (new MailMessage)
->cc(['[email protected]', '[email protected]']);
}
}

class NotificationMailChannelTestNotificationWithPriority extends Notification
{
public function toMail($notifiable)
Expand Down