Make sure it's using right Invite Class

mpociot · Jan 27, 2016 · 0843336 · 0843336
1 parent 045341b
commit 0843336
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git 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
@@ -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";