tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MINOR Making HTTPTest less fragile around global state. Improved test readability.

This commit is contained in:
Ingo Schommer 2011-03-30 23:04:30 +13:00
parent 2870eb9212
commit f4a16d3c77
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/HTTPTest.php
View File

@ -49,17 +49,14 @@ class HTTPTest extends SapphireTest {
public function testSetGetVar() {
// Hackery to work around volatile URL formats in test invocation,
// and the inability of Director::absoluteBaseURL() to produce consistent URLs.
$expectedPath = preg_replace('/\?.*/', '', $_SERVER['REQUEST_URI']);
// TODO This should test the absolute URL, but we can't get it reliably
// with port and auth URI parts.
foreach(array(Director::makeRelative($expectedPath), 'foo=bar') as $e) {
$this->assertContains(
$e,
HTTP::setGetVar('foo', 'bar'),
'Omitting a URL falls back to current URL'
);
}
$origURI = $_SERVER['REQUEST_URI'];
$_SERVER['REQUEST_URI'] = 'relative/url/';
$this->assertContains(
'relative/url/?foo=bar',
HTTP::setGetVar('foo', 'bar'),
'Omitting a URL falls back to current URL'
);
$_SERVER['REQUEST_URI'] = $origURI;
$this->assertEquals(
'relative/url?foo=bar',