From 4b6330b0e16ee9b6354399dca7cdea1ce64c393f Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 8 Feb 2010 04:43:20 +0000 Subject: [PATCH] MINOR Fixed HTTPTest->testSetGetVar() git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98407 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- tests/HTTPTest.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/HTTPTest.php b/tests/HTTPTest.php index dd6b72c94..930a8f406 100644 --- a/tests/HTTPTest.php +++ b/tests/HTTPTest.php @@ -47,14 +47,15 @@ class HTTPTest extends SapphireTest { * Tests {@link HTTP::setGetVar()} */ public function testSetGetVar() { - $currentURL = Director::absoluteURL($_SERVER['REQUEST_URI']); - // Hackery to work around volatile URL formats in test invocation - $expected = $currentURL; - $expected .= (strpos($currentURL, '?') === FALSE) ? '?' : '&'; - $expected .= 'foo=bar'; - $this->assertEquals( - $expected, + $expectedPath = preg_replace('/\?.*/', '', $_SERVER['REQUEST_URI']); + $this->assertContains( + $expectedPath, + HTTP::setGetVar('foo', 'bar'), + 'Omitting a URL falls back to current URL' + ); + $this->assertContains( + 'foo=bar', HTTP::setGetVar('foo', 'bar'), 'Omitting a URL falls back to current URL' );