Show the names of any Mailables which were queued unexpectedly in tests

laravel · Jan 11, 2020 · 45ba8d8 · 45ba8d8
1 parent d86dbd2
commit 45ba8d8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/Illuminate/Support/Testing/Fakes/MailFake.php b/src/Illuminate/Support/Testing/Fakes/MailFake.php
@@ -86,7 +86,7 @@ public function assertNotSent($mailable, $callback = null)
      */
     public function assertNothingSent()
     {
-        $mailableNames = collect($this->mailables)->values()->map(function ($mailable) {
+        $mailableNames = collect($this->mailables)->map(function ($mailable) {
             return get_class($mailable);
         })->join(', ');
         PHPUnit::assertEmpty($this->mailables, 'The following Mailables were sent unexpectedly: ' . $mailableNames);
@@ -148,7 +148,10 @@ public function assertNotQueued($mailable, $callback = null)
      */
     public function assertNothingQueued()
     {
-        PHPUnit::assertEmpty($this->queuedMailables, 'Mailables were queued unexpectedly.');
+        $mailableNames = collect($this->queuedMailables)->map(function ($mailable) {
+            return get_class($mailable);
+        })->join(', ');
+        PHPUnit::assertEmpty($this->queuedMailables, 'The following Mailables were queued unexpectedly: ' . $mailableNames);
     }
 
     /**

diff --git a/tests/Support/SupportTestingMailFakeTest.php b/tests/Support/SupportTestingMailFakeTest.php
@@ -140,6 +140,20 @@ public function testAssertNothingSent()
             $this->assertThat($e, new ExceptionMessage('The following Mailables were sent unexpectedly: Illuminate\Tests\Support\MailableStub'));
         }
     }
+
+    public function testAssertNothingQueued()
+    {
+        $this->fake->assertNothingQueued();
+
+        $this->fake->to('[email protected]')->queue($this->mailable);
+
+        try {
+            $this->fake->assertNothingQueued();
+            $this->fail();
+        } catch (ExpectationFailedException $e) {
+            $this->assertThat($e, new ExceptionMessage('The following Mailables were queued unexpectedly: Illuminate\Tests\Support\MailableStub'));
+        }
+    }
 }
 
 class MailableStub extends Mailable implements MailableContract