Merge pull request #70 from exls/master

calebporzio · web-flow · commit fda78fe3dc64 · 2017-05-16T11:04:00.000-04:00
Fix: trait method seeMessageFrom should work when from set with name
diff --git a/src/Testing/InteractsWithMail.php b/src/Testing/InteractsWithMail.php
@@ -94,7 +94,9 @@ public function seeMessageFrom($email)
     {
         $this->seeMessage();
 
-        $from = $this->lastMessage()->from->first();
+        $from = $this->lastMessage()->from->map(function ($value, $key) {
+            return is_numeric($key) ? $value : $key;
+        })->first();
 
         $this->assertEquals(
             $email,
diff --git a/tests/InteractsWithMailTest.php b/tests/InteractsWithMailTest.php
@@ -148,6 +148,13 @@ public function test_see_message_from()
         });
 
         $this->seeMessageFrom('me@example.com');
+
+        $mailer->send('example-view', [], function ($m) {
+            $m->from('me2@example.com', 'Name');
+            $m->to('john@example.com');
+        });
+
+        $this->seeMessageFrom('me2@example.com');
     }
 
     public function test_see_headers_for()

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,9 @@ public function seeMessageFrom($email)`
`94`	`94`	`{`
`95`	`95`	`$this->seeMessage();`
`96`	`96`
`97`		`- $from = $this->lastMessage()->from->first();`
	`97`	`+ $from = $this->lastMessage()->from->map(function ($value, $key) {`
	`98`	`+ return is_numeric($key) ? $value : $key;`
	`99`	`+ })->first();`
`98`	`100`
`99`	`101`	`$this->assertEquals(`
`100`	`102`	`$email,`
-Original file line number
+Diff line change
         });
         $this->seeMessageFrom('[email protected]');
++
 +        $mailer->send('example-view', [], function ($m) {
 +            $m->from('[email protected]', 'Name');
 +            $m->to('[email protected]');
 +        });
++
 +        $this->seeMessageFrom('[email protected]');
+    }
     public function test_see_headers_for()