From 0843336f60374d64f8104bb6da2f9589929f476d Mon Sep 17 00:00:00 2001 From: Petr Cervenka Date: Wed, 27 Jan 2016 14:44:39 +0800 Subject: [PATCH 1/2] Make sure it's using right Invite Class --- src/Mpociot/Teamwork/Teamwork.php | 8 +++--- tests/TeamworkTest.php | 46 +++++++++++++++---------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/Mpociot/Teamwork/Teamwork.php b/src/Mpociot/Teamwork/Teamwork.php index b55dcd2..f172226 100644 --- a/src/Mpociot/Teamwork/Teamwork.php +++ b/src/Mpociot/Teamwork/Teamwork.php @@ -67,7 +67,7 @@ public function inviteToTeam( $user, $team = null, callable $success = null ) throw new \Exception('The provided object has no "email" attribute and is not a string.'); } - $invite = $this->app->make('Mpociot\Teamwork\TeamInvite'); + $invite = $this->app->make(\Config::get('teamwork.invite_model')); $invite->user_id = $this->user()->getKey(); $invite->team_id = $team; $invite->type = 'invite'; @@ -99,7 +99,7 @@ public function hasPendingInvite( $email, $team ) { $team = $team["id"]; } - return $this->app->make('Mpociot\Teamwork\TeamInvite')->where('email', "=", $email)->where('team_id', "=", $team )->first() ? true : false; + return $this->app->make(\Config::get('teamwork.invite_model'))->where('email', "=", $email)->where('team_id', "=", $team )->first() ? true : false; } /** @@ -108,7 +108,7 @@ public function hasPendingInvite( $email, $team ) */ public function getInviteFromAcceptToken( $token ) { - return $this->app->make('Mpociot\Teamwork\TeamInvite')->where('accept_token', '=', $token)->first(); + return $this->app->make(\Config::get('teamwork.invite_model'))->where('accept_token', '=', $token)->first(); } /** @@ -126,7 +126,7 @@ public function acceptInvite( TeamInvite $invite ) */ public function getInviteFromDenyToken( $token ) { - return $this->app->make('Mpociot\Teamwork\TeamInvite')->where('deny_token', '=', $token)->first(); + return $this->app->make(\Config::get('teamwork.invite_model'))->where('deny_token', '=', $token)->first(); } /** diff --git a/tests/TeamworkTest.php b/tests/TeamworkTest.php index b1245b3..b903124 100644 --- a/tests/TeamworkTest.php +++ b/tests/TeamworkTest.php @@ -51,7 +51,7 @@ public function testGetInviteFromAcceptToken() $teamwork = new Teamwork($app); $token = "asd"; $teaminvite = m::mock('TeamInvite'); - $app->shouldReceive('make')->with('Mpociot\Teamwork\TeamInvite')->once()->andReturn( $teaminvite ); + $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -80,8 +80,8 @@ public function testGetInviteFromDenyToken() $app = m::mock('App'); $teamwork = new Teamwork($app); $token = "asd"; - $teaminvite = m::mock('Mpociot\Teamwork\TeamInvite'); - $app->shouldReceive('make')->with('Mpociot\Teamwork\TeamInvite')->once()->andReturn( $teaminvite ); + $teaminvite = m::mock(\Config::get('teamwork.invite_model')); + $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -110,7 +110,7 @@ public function testDenyInvite() $app = m::mock('App'); $teamwork = new Teamwork($app); $token = "asd"; - $teaminvite = m::mock('Mpociot\Teamwork\TeamInvite'); + $teaminvite = m::mock(\Config::get('teamwork.invite_model')); /* |------------------------------------------------------------ @@ -136,8 +136,8 @@ public function testHasPendingInviteFalse() $app = m::mock('App'); $teamwork = new Teamwork($app); $token = "asd"; - $teaminvite = m::mock('Mpociot\Teamwork\TeamInvite'); - $app->shouldReceive('make')->with('Mpociot\Teamwork\TeamInvite')->once()->andReturn( $teaminvite ); + $teaminvite = m::mock(\Config::get('teamwork.invite_model')); + $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -165,8 +165,8 @@ public function testHasPendingInviteTrue() $app = m::mock('App'); $teamwork = new Teamwork($app); $token = "asd"; - $teaminvite = m::mock('Mpociot\Teamwork\TeamInvite'); - $app->shouldReceive('make')->with('Mpociot\Teamwork\TeamInvite')->once()->andReturn( $teaminvite ); + $teaminvite = m::mock(\Config::get('teamwork.invite_model')); + $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -195,8 +195,8 @@ public function testHasPendingInviteFromObject() $team = m::mock('stdClass'); $team->shouldReceive('getKey')->once()->andReturn( $team_id ); $token = "asd"; - $teaminvite = m::mock('Mpociot\Teamwork\TeamInvite'); - $app->shouldReceive('make')->with('Mpociot\Teamwork\TeamInvite')->once()->andReturn( $teaminvite ); + $teaminvite = m::mock(\Config::get('teamwork.invite_model')); + $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -224,8 +224,8 @@ public function testHasPendingInviteFromArray() $teamwork = new Teamwork($app); $team = ["id" => $team_id]; $token = "asd"; - $teaminvite = m::mock('Mpociot\Teamwork\TeamInvite'); - $app->shouldReceive('make')->with('Mpociot\Teamwork\TeamInvite')->once()->andReturn( $teaminvite ); + $teaminvite = m::mock(\Config::get('teamwork.invite_model')); + $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -258,8 +258,8 @@ public function testCanInviteToTeam() $app->auth->shouldReceive('user') ->andReturn($user) ->once(); - $teaminvite = m::mock('Mpociot\Teamwork\TeamInvite'); - $app->shouldReceive('make')->with('Mpociot\Teamwork\TeamInvite')->once()->andReturn( $teaminvite ); + $teaminvite = m::mock(\Config::get('teamwork.invite_model')); + $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -300,8 +300,8 @@ public function testCanInviteToTeamWithObject() $app->auth->shouldReceive('user') ->andReturn($user) ->once(); - $teaminvite = m::mock('Mpociot\Teamwork\TeamInvite'); - $app->shouldReceive('make')->with('Mpociot\Teamwork\TeamInvite')->once()->andReturn( $teaminvite ); + $teaminvite = m::mock(\Config::get('teamwork.invite_model')); + $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -341,8 +341,8 @@ public function testCanInviteToTeamWithArray() $app->auth->shouldReceive('user') ->andReturn($user) ->once(); - $teaminvite = m::mock('Mpociot\Teamwork\TeamInvite'); - $app->shouldReceive('make')->with('Mpociot\Teamwork\TeamInvite')->once()->andReturn( $teaminvite ); + $teaminvite = m::mock(\Config::get('teamwork.invite_model')); + $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -381,8 +381,8 @@ public function testCanInviteToTeamWithNull() $app->auth->shouldReceive('user') ->andReturn($user); - $teaminvite = m::mock('Mpociot\Teamwork\TeamInvite'); - $app->shouldReceive('make')->with('Mpociot\Teamwork\TeamInvite')->once()->andReturn( $teaminvite ); + $teaminvite = m::mock(\Config::get('teamwork.invite_model')); + $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -420,9 +420,9 @@ public function testCanNotInviteToUserWithoutEmail() $app->auth->shouldReceive('user') ->andReturn($user); - $teaminvite = m::mock('Mpociot\Teamwork\TeamInvite'); + $teaminvite = m::mock(\Config::get('teamwork.invite_model')); - $app->shouldReceive('make')->with('Mpociot\Teamwork\TeamInvite')->never(); + $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->never(); $this->setExpectedException('Exception','The provided object has no "email" attribute and is not a string.'); @@ -448,7 +448,7 @@ public function testCanAcceptInvite() $app->auth->shouldReceive('user') ->andReturn($user); - $teaminvite = m::mock('Mpociot\Teamwork\TeamInvite'); + $teaminvite = m::mock(\Config::get('teamwork.invite_model')); $teaminvite->shouldReceive('setAttribute')->andReturnSelf(); $teaminvite->shouldReceive('getAttribute')->andReturnSelf(); $teaminvite->team = "1"; From ef6f29ea8efe3904ebb896e0140c4d8a13740658 Mon Sep 17 00:00:00 2001 From: Marcel Pociot Date: Tue, 2 Feb 2016 23:18:14 +0100 Subject: [PATCH 2/2] Fix tests and Config namespace --- src/Mpociot/Teamwork/Teamwork.php | 10 +-- tests/TeamworkTest.php | 110 +++++++++++++++++++++++------- 2 files changed, 91 insertions(+), 29 deletions(-) diff --git a/src/Mpociot/Teamwork/Teamwork.php b/src/Mpociot/Teamwork/Teamwork.php index f172226..a44d727 100644 --- a/src/Mpociot/Teamwork/Teamwork.php +++ b/src/Mpociot/Teamwork/Teamwork.php @@ -1,5 +1,7 @@ app->make(\Config::get('teamwork.invite_model')); + $invite = $this->app->make(Config::get('teamwork.invite_model')); $invite->user_id = $this->user()->getKey(); $invite->team_id = $team; $invite->type = 'invite'; @@ -99,7 +101,7 @@ public function hasPendingInvite( $email, $team ) { $team = $team["id"]; } - return $this->app->make(\Config::get('teamwork.invite_model'))->where('email', "=", $email)->where('team_id', "=", $team )->first() ? true : false; + return $this->app->make(Config::get('teamwork.invite_model'))->where('email', "=", $email)->where('team_id', "=", $team )->first() ? true : false; } /** @@ -108,7 +110,7 @@ public function hasPendingInvite( $email, $team ) */ public function getInviteFromAcceptToken( $token ) { - return $this->app->make(\Config::get('teamwork.invite_model'))->where('accept_token', '=', $token)->first(); + return $this->app->make(Config::get('teamwork.invite_model'))->where('accept_token', '=', $token)->first(); } /** @@ -126,7 +128,7 @@ public function acceptInvite( TeamInvite $invite ) */ public function getInviteFromDenyToken( $token ) { - return $this->app->make(\Config::get('teamwork.invite_model'))->where('deny_token', '=', $token)->first(); + return $this->app->make(Config::get('teamwork.invite_model'))->where('deny_token', '=', $token)->first(); } /** diff --git a/tests/TeamworkTest.php b/tests/TeamworkTest.php index b903124..3f55188 100644 --- a/tests/TeamworkTest.php +++ b/tests/TeamworkTest.php @@ -1,5 +1,6 @@ shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); + + + $inviteClass = 'Mpociot\Teamwork\TeamInvite'; + Config::shouldReceive('get') + ->once() + ->with('teamwork.invite_model') + ->andReturn($inviteClass); + $teaminvite = m::mock($inviteClass); + $app->shouldReceive('make')->with($inviteClass)->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -80,8 +88,14 @@ public function testGetInviteFromDenyToken() $app = m::mock('App'); $teamwork = new Teamwork($app); $token = "asd"; - $teaminvite = m::mock(\Config::get('teamwork.invite_model')); - $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); + + $inviteClass = 'Mpociot\Teamwork\TeamInvite'; + Config::shouldReceive('get') + ->once() + ->with('teamwork.invite_model') + ->andReturn($inviteClass); + $teaminvite = m::mock($inviteClass); + $app->shouldReceive('make')->with($inviteClass)->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -110,7 +124,7 @@ public function testDenyInvite() $app = m::mock('App'); $teamwork = new Teamwork($app); $token = "asd"; - $teaminvite = m::mock(\Config::get('teamwork.invite_model')); + $teaminvite = m::mock('Mpociot\Teamwork\TeamInvite'); /* |------------------------------------------------------------ @@ -136,8 +150,15 @@ public function testHasPendingInviteFalse() $app = m::mock('App'); $teamwork = new Teamwork($app); $token = "asd"; - $teaminvite = m::mock(\Config::get('teamwork.invite_model')); - $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); + + + $inviteClass = 'Mpociot\Teamwork\TeamInvite'; + Config::shouldReceive('get') + ->once() + ->with('teamwork.invite_model') + ->andReturn($inviteClass); + $teaminvite = m::mock($inviteClass); + $app->shouldReceive('make')->with($inviteClass)->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -165,8 +186,14 @@ public function testHasPendingInviteTrue() $app = m::mock('App'); $teamwork = new Teamwork($app); $token = "asd"; - $teaminvite = m::mock(\Config::get('teamwork.invite_model')); - $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); + + $inviteClass = 'Mpociot\Teamwork\TeamInvite'; + Config::shouldReceive('get') + ->once() + ->with('teamwork.invite_model') + ->andReturn($inviteClass); + $teaminvite = m::mock($inviteClass); + $app->shouldReceive('make')->with($inviteClass)->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -195,8 +222,14 @@ public function testHasPendingInviteFromObject() $team = m::mock('stdClass'); $team->shouldReceive('getKey')->once()->andReturn( $team_id ); $token = "asd"; - $teaminvite = m::mock(\Config::get('teamwork.invite_model')); - $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); + + $inviteClass = 'Mpociot\Teamwork\TeamInvite'; + Config::shouldReceive('get') + ->once() + ->with('teamwork.invite_model') + ->andReturn($inviteClass); + $teaminvite = m::mock($inviteClass); + $app->shouldReceive('make')->with($inviteClass)->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -224,8 +257,14 @@ public function testHasPendingInviteFromArray() $teamwork = new Teamwork($app); $team = ["id" => $team_id]; $token = "asd"; - $teaminvite = m::mock(\Config::get('teamwork.invite_model')); - $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); + + $inviteClass = 'Mpociot\Teamwork\TeamInvite'; + Config::shouldReceive('get') + ->once() + ->with('teamwork.invite_model') + ->andReturn($inviteClass); + $teaminvite = m::mock($inviteClass); + $app->shouldReceive('make')->with($inviteClass)->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -258,8 +297,14 @@ public function testCanInviteToTeam() $app->auth->shouldReceive('user') ->andReturn($user) ->once(); - $teaminvite = m::mock(\Config::get('teamwork.invite_model')); - $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); + + $inviteClass = 'Mpociot\Teamwork\TeamInvite'; + Config::shouldReceive('get') + ->once() + ->with('teamwork.invite_model') + ->andReturn($inviteClass); + $teaminvite = m::mock($inviteClass); + $app->shouldReceive('make')->with($inviteClass)->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -300,8 +345,14 @@ public function testCanInviteToTeamWithObject() $app->auth->shouldReceive('user') ->andReturn($user) ->once(); - $teaminvite = m::mock(\Config::get('teamwork.invite_model')); - $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); + + $inviteClass = 'Mpociot\Teamwork\TeamInvite'; + Config::shouldReceive('get') + ->once() + ->with('teamwork.invite_model') + ->andReturn($inviteClass); + $teaminvite = m::mock($inviteClass); + $app->shouldReceive('make')->with($inviteClass)->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -341,8 +392,14 @@ public function testCanInviteToTeamWithArray() $app->auth->shouldReceive('user') ->andReturn($user) ->once(); - $teaminvite = m::mock(\Config::get('teamwork.invite_model')); - $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); + + $inviteClass = 'Mpociot\Teamwork\TeamInvite'; + Config::shouldReceive('get') + ->once() + ->with('teamwork.invite_model') + ->andReturn($inviteClass); + $teaminvite = m::mock($inviteClass); + $app->shouldReceive('make')->with($inviteClass)->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -381,8 +438,13 @@ public function testCanInviteToTeamWithNull() $app->auth->shouldReceive('user') ->andReturn($user); - $teaminvite = m::mock(\Config::get('teamwork.invite_model')); - $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->once()->andReturn( $teaminvite ); + $inviteClass = 'Mpociot\Teamwork\TeamInvite'; + Config::shouldReceive('get') + ->once() + ->with('teamwork.invite_model') + ->andReturn($inviteClass); + $teaminvite = m::mock($inviteClass); + $app->shouldReceive('make')->with($inviteClass)->once()->andReturn( $teaminvite ); /* |------------------------------------------------------------ @@ -420,9 +482,7 @@ public function testCanNotInviteToUserWithoutEmail() $app->auth->shouldReceive('user') ->andReturn($user); - $teaminvite = m::mock(\Config::get('teamwork.invite_model')); - - $app->shouldReceive('make')->with(\Config::get('teamwork.invite_model'))->never(); + $app->shouldReceive('make')->with('Mpociot\Teamwork\TeamInvite')->never(); $this->setExpectedException('Exception','The provided object has no "email" attribute and is not a string.'); @@ -448,7 +508,7 @@ public function testCanAcceptInvite() $app->auth->shouldReceive('user') ->andReturn($user); - $teaminvite = m::mock(\Config::get('teamwork.invite_model')); + $teaminvite = m::mock('Mpociot\Teamwork\TeamInvite'); $teaminvite->shouldReceive('setAttribute')->andReturnSelf(); $teaminvite->shouldReceive('getAttribute')->andReturnSelf(); $teaminvite->team = "1";