From 2085580184696f32c25196aee65fb13b42abe7b4 Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Wed, 25 Apr 2018 15:14:13 +0200
Subject: [PATCH] dev #74650 fix failures
---
.../controllers/FileManagerControllerTest.php | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/tests/application/modules/admin/controllers/FileManagerControllerTest.php b/tests/application/modules/admin/controllers/FileManagerControllerTest.php
index 45a3f0d5e35..0652c019bab 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'],
--
GitLab