diff --git a/tests/application/modules/admin/controllers/FileManagerControllerTest.php b/tests/application/modules/admin/controllers/FileManagerControllerTest.php index 45a3f0d5e35b0468bdefda62836c2964ab3dd2ce..0652c019bab6eea28f669f993c1d2b42e5978094 100644 --- a/tests/application/modules/admin/controllers/FileManagerControllerTest.php +++ b/tests/application/modules/admin/controllers/FileManagerControllerTest.php @@ -1670,7 +1670,7 @@ class FileManagerControllerFindTest extends ModelTestCase { public function setUp() { parent::setUp(); - $this->_initUrl(); + $this->_initPhpMode(); $admin = $this->fixture('Class_Users', ['id' => 3, 'login' => 'admin', @@ -1680,23 +1680,13 @@ class FileManagerControllerFindTest extends ModelTestCase { } - public function tearDown() { - $_SERVER['SERVER_NAME'] = $this->old_server_name; - parent::tearDown(); - } - - - protected function _initUrl() { - if(!$this->old_server_name) - $this->old_server_name = $_SERVER['SERVER_NAME']; - + protected function _initPhpMode() { Class_Url::setPhpMode('apache'); - $_SERVER['SERVER_NAME'] = 'test.bokeh.org'; } public function getUrlAndPaths() { - $this->_initUrl(); + $this->_initPhpMode(); return [ ['userfiles', 'userfiles'], ['/userfiles', 'userfiles'],