-
Notifications
You must be signed in to change notification settings - Fork 11k
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] Added support for notifications MailChannel using messages that implements Mailable contract #15318
Merged
Merged
[5.3] Added support for notifications MailChannel using messages that implements Mailable contract #15318
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
41eccb8
support for notifications MailChannel using messages that implements …
butschster f531e39
Fix StyleCI
butschster 7b1916e
add unit test for Mailable Notification
butschster 56c9d91
Fix StyleCI
butschster 6cac4df
remove leading slash and extra brackets
butschster File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -210,6 +210,20 @@ public function testMessageWithToAddress() | |
|
||
$channel->send($notifiable, $notification); | ||
} | ||
|
||
public function testMessageWithMailableContract() | ||
{ | ||
$notification = new NotificationMailChannelTestNotificationWithMailableContract; | ||
$notifiable = new NotificationMailChannelTestNotifiable; | ||
|
||
$channel = new Illuminate\Notifications\Channels\MailChannel( | ||
$mailer = Mockery::mock(Illuminate\Contracts\Mail\Mailer::class) | ||
); | ||
|
||
$mailer->shouldReceive('send')->once(); | ||
|
||
$channel->send($notifiable, $notification); | ||
} | ||
} | ||
|
||
class NotificationMailChannelTestNotifiable | ||
|
@@ -272,3 +286,23 @@ public function toMail($notifiable) | |
->to('jeffrey@laracasts.com'); | ||
} | ||
} | ||
|
||
class NotificationMailChannelTestNotificationWithMailableContract extends Notification | ||
{ | ||
public function toMail($notifiable) | ||
{ | ||
$mock = Mockery::mock(Illuminate\Contracts\Mail\Mailable::class); | ||
|
||
$mock->shouldReceive('send')->once()->with(Mockery::on(function($mailer) { | ||
if (! ($mailer instanceof \Illuminate\Contracts\Mail\Mailer)) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No leading slash please. Also, no extra brackets are needed. |
||
return false; | ||
} | ||
|
||
$mailer->send('notifications::email-plain'); | ||
|
||
return true; | ||
})); | ||
|
||
return $mock; | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mailer would receive send anyway, I think you need to test that the Mailable object would receive send in this case.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, didn't notice the test below.