From fd164ae38b17307b806b62923c88a8e3d2de266c Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Wed, 14 Oct 2015 17:10:56 -0700
Subject: [PATCH] phantomjs passes port with host name in HTTP Host: header, so
remove it if present during UI tests.
---
tests/PHPUnit/Fixtures/UITestFixture.php | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php
index 1e9543eb04..b9f91a13cf 100644
--- a/tests/PHPUnit/Fixtures/UITestFixture.php
+++ b/tests/PHPUnit/Fixtures/UITestFixture.php
@@ -330,4 +330,22 @@ class UITestFixture extends SqlDump
APISegmentEditor::getInstance()->add(
"Multiple actions", "actions>=2", $idSite = 1, $autoArchive = false, $enabledAllUsers = true);
}
+
+ public function provideContainerConfig()
+ {
+ if (isset($_SERVER['HTTP_HOST'])) {
+ // phantomjs sends the port in HTTP_HOST which causes some UI tests to fail. so if it's present, we remove it here.
+ $_SERVER['HTTP_HOST'] = $this->removePortIfPresent($_SERVER['HTTP_HOST']);
+ }
+
+ return array();
+ }
+
+ private function removePortIfPresent($host)
+ {
+ if (preg_match("/(.*[^:]):[0-9]+/", $host, $matches)) {
+ return $matches[1];
+ }
+ return $host;
+ }
}
--
GitLab