diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpFoundation] Fixed the tests

Browse Source 
b8a2f8c646 reverted the use of the username
and password in the getSchemeAndHost method but forgot to revert the
corresponding tests.
This commit is contained in:
Christophe Coevoet 2012-09-25 14:32:56 +02:00
parent 21d16e60fa
commit b961ee3a62
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
View File

@ -136,7 +136,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
$this->assertFalse($request->isSecure());
$request = Request::create('http://test:test@test.com');
$this->assertEquals('http://test:test@test.com/', $request->getUri());
$this->assertEquals('http://test.com/', $request->getUri());
$this->assertEquals('/', $request->getPathInfo());
$this->assertEquals('', $request->getQueryString());
$this->assertEquals(80, $request->getPort());
@ -146,7 +146,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
$this->assertFalse($request->isSecure());
$request = Request::create('http://testnopass@test.com');
$this->assertEquals('http://testnopass@test.com/', $request->getUri());
$this->assertEquals('http://test.com/', $request->getUri());
$this->assertEquals('/', $request->getPathInfo());
$this->assertEquals('', $request->getQueryString());
$this->assertEquals(80, $request->getPort());
@ -340,11 +340,11 @@ class RequestTest extends \PHPUnit_Framework_TestCase
$server['PHP_AUTH_USER'] = 'fabien';
$request->initialize(array(), array(), array(), array(), array(), $server);
$this->assertEquals('http://fabien@hostname:8080/ba%20se/index_dev.php/foo%20bar/in+fo?query=string', $request->getUri());
$this->assertEquals('http://hostname:8080/ba%20se/index_dev.php/foo%20bar/in+fo?query=string', $request->getUri());
$server['PHP_AUTH_PW'] = 'symfony';
$request->initialize(array(), array(), array(), array(), array(), $server);
$this->assertEquals('http://fabien:symfony@hostname:8080/ba%20se/index_dev.php/foo%20bar/in+fo?query=string', $request->getUri());
$this->assertEquals('http://hostname:8080/ba%20se/index_dev.php/foo%20bar/in+fo?query=string', $request->getUri());
}
/**
@ -450,11 +450,11 @@ class RequestTest extends \PHPUnit_Framework_TestCase
$server['PHP_AUTH_USER'] = 'fabien';
$request->initialize(array(), array(), array(), array(), array(), $server);
$this->assertEquals('http://fabien@servername/some/path', $request->getUriForPath('/some/path'));
$this->assertEquals('http://servername/some/path', $request->getUriForPath('/some/path'));
$server['PHP_AUTH_PW'] = 'symfony';
$request->initialize(array(), array(), array(), array(), array(), $server);
$this->assertEquals('http://fabien:symfony@servername/some/path', $request->getUriForPath('/some/path'));
$this->assertEquals('http://servername/some/path', $request->getUriForPath('/some/path'));
}
/**
@ -491,15 +491,15 @@ class RequestTest extends \PHPUnit_Framework_TestCase
$server['PHP_AUTH_USER'] = 'fabien';
$request->initialize(array(), array(), array(), array(), array(), $server);
$this->assertEquals('http://fabien@servername:90', $request->getSchemeAndHttpHost());
$this->assertEquals('http://servername:90', $request->getSchemeAndHttpHost());
$server['PHP_AUTH_USER'] = '0';
$request->initialize(array(), array(), array(), array(), array(), $server);
$this->assertEquals('http://0@servername:90', $request->getSchemeAndHttpHost());
$this->assertEquals('http://servername:90', $request->getSchemeAndHttpHost());
$server['PHP_AUTH_PW'] = '0';
$request->initialize(array(), array(), array(), array(), array(), $server);
$this->assertEquals('http://0:0@servername:90', $request->getSchemeAndHttpHost());
$this->assertEquals('http://servername:90', $request->getSchemeAndHttpHost());
}
/**