Fix PHP errors in test cases related to now using Symfony's HttpFoundation component.

This commit is contained in:
Franz Liedke
2012-07-13 03:05:55 +02:00
parent 86013f1b84
commit feefa8d9c4
5 changed files with 91 additions and 42 deletions

View File

@@ -39,18 +39,18 @@ class RedirectTest extends PHPUnit_Framework_TestCase {
{
$redirect = Redirect::to('user/profile');
$this->assertEquals(302, $redirect->status);
$this->assertEquals('http://localhost/user/profile', $redirect->headers['location']);
$this->assertEquals(302, $redirect->status());
$this->assertEquals('http://localhost/user/profile', $redirect->headers()->get('location'));
$redirect = Redirect::to('user/profile', 301, true);
$this->assertEquals(301, $redirect->status);
$this->assertEquals('https://localhost/user/profile', $redirect->headers['location']);
$this->assertEquals(301, $redirect->status());
$this->assertEquals('https://localhost/user/profile', $redirect->headers()->get('location'));
$redirect = Redirect::to_secure('user/profile', 301);
$this->assertEquals(301, $redirect->status);
$this->assertEquals('https://localhost/user/profile', $redirect->headers['location']);
$this->assertEquals(301, $redirect->status());
$this->assertEquals('https://localhost/user/profile', $redirect->headers()->get('location'));
}
/**
@@ -64,10 +64,10 @@ class RedirectTest extends PHPUnit_Framework_TestCase {
Route::get('redirect/(:any)/(:any)', array('as' => 'redirect-2'));
Route::get('secure/redirect', array('https' => true, 'as' => 'redirect-3'));
$this->assertEquals(301, Redirect::to_route('redirect', array(), 301, true)->status);
$this->assertEquals('http://localhost/redirect', Redirect::to_route('redirect')->headers['location']);
$this->assertEquals('https://localhost/secure/redirect', Redirect::to_route('redirect-3', array(), 302)->headers['location']);
$this->assertEquals('http://localhost/redirect/1/2', Redirect::to_route('redirect-2', array('1', '2'))->headers['location']);
$this->assertEquals(301, Redirect::to_route('redirect', array(), 301, true)->status());
$this->assertEquals('http://localhost/redirect', Redirect::to_route('redirect')->headers()->get('location'));
$this->assertEquals('https://localhost/secure/redirect', Redirect::to_route('redirect-3', array(), 302)->headers()->get('location'));
$this->assertEquals('http://localhost/redirect/1/2', Redirect::to_route('redirect-2', array('1', '2'))->headers()->get('location'));
}
/**