浏览代码

Set both env and server globals.

Mark Scherer 11 年之前
父节点
当前提交
35e586396d
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      TestSuite/IntegrationTestCase.php

+ 4 - 1
TestSuite/IntegrationTestCase.php

@@ -166,16 +166,19 @@ abstract class IntegrationTestCase extends MyControllerTestCase {
 		}
 		}
 
 
 		CakeSession::write($this->_sessionData);
 		CakeSession::write($this->_sessionData);
-		$envBackup = array();
+		$envBackup = $serverBackup = array();
 		foreach ($env as $k => $v) {
 		foreach ($env as $k => $v) {
 			$envBackup[$k] = isset($_ENV[$k]) ? $_ENV[$k] : null;
 			$envBackup[$k] = isset($_ENV[$k]) ? $_ENV[$k] : null;
+			$serverBackup[$k] = isset($_ENV[$k]) ? $_ENV[$k] : null;
 			$_ENV[$k] = $v;
 			$_ENV[$k] = $v;
+			$_SERVER[$k] = $v;
 		}
 		}
 
 
 		$result = $this->testAction($url, $options);
 		$result = $this->testAction($url, $options);
 
 
 		foreach ($env as $k => $v) {
 		foreach ($env as $k => $v) {
 			$_ENV[$k] = $envBackup[$k];
 			$_ENV[$k] = $envBackup[$k];
+			$_SERVER[$k] = $serverBackup[$k];
 		}
 		}
 
 
 		$this->_response = $this->controller->response;
 		$this->_response = $this->controller->response;