diff --git a/tests/control/DirectorTest.php b/tests/control/DirectorTest.php index a83a541ae..274a2610a 100644 --- a/tests/control/DirectorTest.php +++ b/tests/control/DirectorTest.php @@ -123,7 +123,6 @@ class DirectorTest extends SapphireTest { } public function testResetGlobalsAfterTestRequest() { - $_GET = array('somekey' => 'getvalue'); $_POST = array('somekey' => 'postvalue'); $_COOKIE = array('somekey' => 'cookievalue'); @@ -136,21 +135,15 @@ class DirectorTest extends SapphireTest { } public function testTestRequestCarriesGlobals() { - $fixture = array('somekey' => 'sometestvalue'); - foreach(array('get', 'post') as $method) { - foreach(array('return%sValue', 'returnRequestValue', 'returnCookieValue') as $testfunction) { - $url = 'DirectorTestRequest_Controller/' . sprintf($testfunction, ucfirst($method)) . '?' . http_build_query($fixture); $getresponse = Director::test($url, $fixture, null, strtoupper($method), null, null, $fixture); $this->assertType('SS_HTTPResponse', $getresponse, 'Director::test() returns SS_HTTPResponse'); $this->assertEquals($fixture['somekey'], $getresponse->getBody(), 'Director::test() ' . $testfunction); - } - } }