diff --git a/tests/application/modules/admin/controllers/FileManagerControllerTest.php b/tests/application/modules/admin/controllers/FileManagerControllerTest.php index ffbaa12ca8c4b79e6c2f404a79843e8da5c262d9..45a3f0d5e35b0468bdefda62836c2964ab3dd2ce 100644 --- a/tests/application/modules/admin/controllers/FileManagerControllerTest.php +++ b/tests/application/modules/admin/controllers/FileManagerControllerTest.php @@ -1663,12 +1663,13 @@ class FileManagerControllerRigthsOnPathTest extends ModelTestCase { class FileManagerControllerFindTest extends ModelTestCase { - protected $_storm_default_to_volatile = true; + protected + $old_server_name, + $_storm_default_to_volatile = true; public function setUp() { parent::setUp(); - $this->old_server_name = $_SERVER['SERVER_NAME']; $this->_initUrl(); $admin = $this->fixture('Class_Users', ['id' => 3, @@ -1686,7 +1687,10 @@ class FileManagerControllerFindTest extends ModelTestCase { protected function _initUrl() { - Class_Url::setPhpMode('web'); + if(!$this->old_server_name) + $this->old_server_name = $_SERVER['SERVER_NAME']; + + Class_Url::setPhpMode('apache'); $_SERVER['SERVER_NAME'] = 'test.bokeh.org'; }