Skip to content

Commit af848dc

Browse files
Merge pull request #38 from stackkit/bugfix/laravel-8-mail-address-change
Fix test assertion due to Laravel 8 change
2 parents 429975f + f35d100 commit af848dc

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

tests/MailableReaderTest.php

+9-3
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,15 @@ public function it_extracts_the_from_address_and_or_name()
100100
->from(null, 'Marick')
101101
)->send();
102102

103-
$this->assertTrue($email->hasFrom());
104-
$this->assertEquals(config('mail.from.address'), $email->getFromAddress());
105-
$this->assertEquals('Marick', $email->getFromName());
103+
// 8.x no longer accepts an empty address.
104+
// https://github.com/laravel/framework/pull/39035
105+
if (version_compare(app()->version(), '8.0.0', '>=')) {
106+
$this->assertFalse($email->hasFrom());
107+
} else {
108+
$this->assertTrue($email->hasFrom());
109+
$this->assertEquals(config('mail.from.address'), $email->getFromAddress());
110+
$this->assertEquals('Marick', $email->getFromName());
111+
}
106112
}
107113
}
108114

0 commit comments

Comments
 (0)