modify tests to use 5.4 features

mpociot · Jan 29, 2017 · dcd7d9a · dcd7d9a
1 parent e4d4f9b
commit dcd7d9a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/tests/TeamworkTest.php b/tests/TeamworkTest.php
@@ -166,7 +166,7 @@ public function testCanInviteToTeam()
             ->with( m::type(TeamInvite::class) )->andReturn();
         \Teamwork::inviteToTeam( $email, $team->getKey(), array($callback,'callback') );
 
-        $this->seeInDatabase(config('teamwork.team_invites_table'),[
+        $this->assertDatabaseHas(config('teamwork.team_invites_table'),[
             'email' => 'asd@fake.com',
             'user_id' => $this->user->getKey(),
             'team_id' => $team->getKey()
@@ -185,7 +185,7 @@ public function testCanInviteToTeamWithObject()
             ->with( m::type(TeamInvite::class) )->andReturn();
         \Teamwork::inviteToTeam( $email, $team, array($callback,'callback') );
 
-        $this->seeInDatabase(config('teamwork.team_invites_table'),[
+        $this->assertDatabaseHas(config('teamwork.team_invites_table'),[
             'email' => 'asd@fake.com',
             'user_id' => $this->user->getKey(),
             'team_id' => $team->getKey()
@@ -204,7 +204,7 @@ public function testCanInviteToTeamWithArray()
             ->with( m::type(TeamInvite::class) )->andReturn();
         \Teamwork::inviteToTeam( $email, $team->toArray(), array($callback,'callback') );
 
-        $this->seeInDatabase(config('teamwork.team_invites_table'),[
+        $this->assertDatabaseHas(config('teamwork.team_invites_table'),[
             'email' => 'asd@fake.com',
             'user_id' => $this->user->getKey(),
             'team_id' => $team->getKey()
@@ -222,7 +222,7 @@ public function testCanInviteToTeamWithUser()
             ->with( m::type(TeamInvite::class) )->andReturn();
         \Teamwork::inviteToTeam( $this->user, $team->toArray(), array($callback,'callback') );
 
-        $this->seeInDatabase(config('teamwork.team_invites_table'),[
+        $this->assertDatabaseHas(config('teamwork.team_invites_table'),[
             'email' => 'asd@fake.com',
             'user_id' => $this->user->getKey(),
             'team_id' => $team->getKey()
@@ -242,7 +242,7 @@ public function testCanInviteToTeamWithNull()
             ->with( m::type(TeamInvite::class) )->andReturn();
         \Teamwork::inviteToTeam( $email, null, array($callback,'callback') );
 
-        $this->seeInDatabase(config('teamwork.team_invites_table'),[
+        $this->assertDatabaseHas(config('teamwork.team_invites_table'),[
             'email' => 'asd@fake.com',
             'team_id' => $team->getKey()
         ]);
@@ -258,7 +258,7 @@ public function testCanInviteToTeamWithoutCallback()
 
         \Teamwork::inviteToTeam( $email );
 
-        $this->seeInDatabase(config('teamwork.team_invites_table'),[
+        $this->assertDatabaseHas(config('teamwork.team_invites_table'),[
             'email' => 'asd@fake.com',
             'team_id' => $team->getKey()
         ]);

diff --git a/tests/UsedByTeamsTraitTest.php b/tests/UsedByTeamsTraitTest.php
@@ -123,7 +123,7 @@ public function testScopeAutomaticallyAddsCurrentTeam()
         $task->name = 'Buy milk';
         $task->save();
 
-        $this->seeInDatabase('tasks', [
+        $this->assertDatabaseHas('tasks', [
             'name' => 'Buy milk',
             'team_id' => $this->user->currentTeam->getKey()
         ]);

diff --git a/tests/UserHasTeamsTraitTest.php b/tests/UserHasTeamsTraitTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Event;
 use Mpociot\Teamwork\TeamworkTeam;
 
 class UserHasTeamsTraitTest extends Orchestra\Testbench\TestCase
@@ -119,7 +120,7 @@ public function testCanSetPivotDataOnAttachTeamMethod()
 
         $this->user->attachTeam($team, $pivotData);
 
-        $this->seeInDatabase(config('teamwork.team_user_table'), [
+        $this->assertDatabaseHas(config('teamwork.team_user_table'), [
             'user_id' => $this->user->getKey(),
             'team_id' => $team->getKey(),
             'pivot_set' => true
@@ -191,20 +192,28 @@ public function testDetachTeamResetsCurrentTeam()
 
     public function testAttachTeamFiresEvent()
     {
-        $this->expectsEvents(\Mpociot\Teamwork\Events\UserJoinedTeam::class);
-        $this->doesntExpectEvents(\Mpociot\Teamwork\Events\UserLeftTeam::class);
+        Event::fake();
 
         $team1 = TeamworkTeam::create(['name' => 'Test-Team 1']);
         $this->user->attachTeam($team1);
+
+        Event::assertDispatched(\Mpociot\Teamwork\Events\UserJoinedTeam::class, function ($e) use ($team1) {
+            return $e->getTeamId() === $team1->id && $e->getUser()->id === $this->user->id;
+        });
+        Event::assertNotDispatched(\Mpociot\Teamwork\Events\UserLeftTeam::class);
     }
 
     public function testDetachTeamFiresEvent()
     {
-        $this->expectsEvents(\Mpociot\Teamwork\Events\UserLeftTeam::class);
+        Event::fake();
 
         $team1 = TeamworkTeam::create(['name' => 'Test-Team 1']);
         $this->user->attachTeam($team1);
         $this->user->detachTeam($team1);
+
+        Event::assertDispatched(\Mpociot\Teamwork\Events\UserLeftTeam::class, function ($e) use ($team1) {
+            return $e->getTeamId() === $team1->id && $e->getUser()->id === $this->user->id;
+        });
     }
 
     public function testCanAttachMultipleTeams()