From f35d1006af65e842b36f9f721e301cb66dc52b61 Mon Sep 17 00:00:00 2001 From: Marick van Tuil Date: Sat, 4 Dec 2021 22:04:58 +0100 Subject: [PATCH] Fix test assertion due to Laravel 8 change --- tests/MailableReaderTest.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/MailableReaderTest.php b/tests/MailableReaderTest.php index 3f14408..173ea81 100644 --- a/tests/MailableReaderTest.php +++ b/tests/MailableReaderTest.php @@ -100,9 +100,15 @@ public function it_extracts_the_from_address_and_or_name() ->from(null, 'Marick') )->send(); - $this->assertTrue($email->hasFrom()); - $this->assertEquals(config('mail.from.address'), $email->getFromAddress()); - $this->assertEquals('Marick', $email->getFromName()); + // 8.x no longer accepts an empty address. + // https://github.com/laravel/framework/pull/39035 + if (version_compare(app()->version(), '8.0.0', '>=')) { + $this->assertFalse($email->hasFrom()); + } else { + $this->assertTrue($email->hasFrom()); + $this->assertEquals(config('mail.from.address'), $email->getFromAddress()); + $this->assertEquals('Marick', $email->getFromName()); + } } }