Fix seeAuthenticatedAs when using 2 different user models that repres…

…ent the same user (#13308)
laravel · Apr 27, 2016 · b6735f7 · b6735f7
1 parent 733ceda
commit b6735f7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/Illuminate/Foundation/Testing/Concerns/InteractsWithAuthentication.php b/src/Illuminate/Foundation/Testing/Concerns/InteractsWithAuthentication.php
@@ -50,8 +50,15 @@ protected function isAuthenticated($guard = null)
      */
     public function seeIsAuthenticatedAs($user, $guard = null)
     {
+        $expected = $this->app->make('auth')->guard($guard)->user();
+
+        $this->assertInstanceOf(
+            get_class($expected), $user,
+            'The logged in user is not the same'
+        );
+
         $this->assertSame(
-            $this->app->make('auth')->guard($guard)->user(), $user,
+            $expected->getAuthIdentifier(), $user->getAuthIdentifier(),
             'The logged in user is not the same'
         );
 

diff --git a/tests/Foundation/FoundationAuthenticationTest.php b/tests/Foundation/FoundationAuthenticationTest.php
@@ -73,12 +73,20 @@ public function testDontSeeIsAuthenticated()
 
     public function testSeeIsAuthenticatedAs()
     {
+        $expected = m::mock(Authenticatable::class);
+        $expected->shouldReceive('getAuthIdentifier')
+            ->andReturn('1');
+
         $this->mockGuard()
             ->shouldReceive('user')
             ->once()
-            ->andReturn('Someone');
+            ->andReturn($expected);
+
+        $user = m::mock(Authenticatable::class);
+        $user->shouldReceive('getAuthIdentifier')
+            ->andReturn('1');
 
-        $this->seeIsAuthenticatedAs('Someone');
+        $this->seeIsAuthenticatedAs($user);
     }
 
     protected function setupProvider(array $credentials)