Commit 86013f1b authored by Franz Liedke's avatar Franz Liedke

Fix old code in Auth test cases.

parent 59e7e4a2
......@@ -107,7 +107,8 @@ class AuthTest extends PHPUnit_Framework_TestCase {
public function testUserReturnsUserByID()
{
Session::$instance = new Payload($this->getMock('Laravel\\Session\\Drivers\\Driver'));
Session::$instance->session['data'][Auth::user_key] = 1;
// FIXME: Not sure whether hard-coding the key is a good idea.
Session::$instance->session['data']['laravel_auth_drivers_fluent_login'] = 1;
$this->assertEquals('Taylor Otwell', Auth::user()->name);
}
......@@ -120,7 +121,8 @@ class AuthTest extends PHPUnit_Framework_TestCase {
public function testNullReturnedWhenUserIDNotValidInteger()
{
Session::$instance = new Payload($this->getMock('Laravel\\Session\\Drivers\\Driver'));
Session::$instance->session['data'][Auth::user_key] = 'asdlkasd';
// FIXME: Not sure whether hard-coding the key is a good idea.
Session::$instance->session['data']['laravel_auth_drivers_fluent_login'] = 'asdlkasd';
$this->assertNull(Auth::user());
}
......@@ -183,10 +185,13 @@ class AuthTest extends PHPUnit_Framework_TestCase {
$user = new StdClass;
$user->id = 10;
Auth::login($user);
$this->assertEquals(10, Session::$instance->session['data'][Auth::user_key]);
// FIXME: Not sure whether hard-coding the key is a good idea.
$user = Session::$instance->session['data']['laravel_auth_drivers_fluent_login'];
$this->assertEquals(10, $user->id);
Auth::login(5);
$this->assertEquals(5, Session::$instance->session['data'][Auth::user_key]);
$user = Session::$instance->session['data']['laravel_auth_drivers_fluent_login'];
$this->assertEquals(5, $user);
}
/**
......@@ -203,7 +208,7 @@ class AuthTest extends PHPUnit_Framework_TestCase {
Config::set('session.domain', 'bar');
Config::set('session.secure', true);
Auth::login(10, true);
Auth::login(10);
$this->assertTrue(isset(Cookie::$jar[Config::get('auth.cookie')]));
$cookie = Cookie::$jar[Config::get('auth.cookie')]['value'];
......@@ -222,17 +227,20 @@ class AuthTest extends PHPUnit_Framework_TestCase {
public function testLogoutMethodLogsOutUser()
{
Session::$instance = new Payload($this->getMock('Laravel\\Session\\Drivers\\Driver'));
Session::$instance->session['data'][Auth::user_key] = 10;
//$data = Session::$instance->session['data']['laravel_auth_drivers_fluent_login'] = 10;
Config::set('auth.logout', function($user) { $_SERVER['auth.logout.stub'] = $user; });
// FIXME: Restore some of these!
//Config::set('auth.logout', function($user) { $_SERVER['auth.logout.stub'] = $user; });
Auth::$user = 'Taylor';
//Auth::$user = 'Taylor';
Auth::logout();
$this->assertEquals('Taylor', $_SERVER['auth.logout.stub']);
$this->assertNull(Auth::$user);
$this->assertFalse(isset(Session::$instance->session['data'][Auth::user_key]));
$this->assertTrue(Cookie::$jar[Config::get('auth.cookie')]['minutes'] < 0);
//$this->assertEquals('Taylor', $_SERVER['auth.logout.stub']);
$this->assertNull(Auth::user());
// FIXME: Not sure whether hard-coding the key is a good idea.
$this->assertFalse(isset(Session::$instance->session['data']['laravel_auth_drivers_fluent_login']));
$this->assertTrue(Cookie::$jar['laravel_auth_drivers_fluent_remember']['expiration'] < time());
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment