Make sure server port is included in current URLs in case Piwik is on a separate URL.

1 files changed, 14 insertions, 1 deletions

diff --git a/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php b/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php
index be1c17f959..cbd7f9185c 100644
--- a/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php
+++ b/tests/PHPUnit/Framework/TestingEnvironmentManipulator.php
@@ -55,6 +55,8 @@ class TestingEnvironmentManipulator implements EnvironmentManipulator
     {
         $this->vars = $testingEnvironment;
         $this->globalObservers = $globalObservers;
+
+        $this->removePortIfPresentInHttpHeader();
     }
 
     public function makeGlobalSettingsProvider(GlobalSettingsProvider $original)
@@ -234,4 +236,15 @@ class TestingEnvironmentManipulator implements EnvironmentManipulator
                 . "Is the namespace correct? Is the file in the correct folder?");
         }
     }
-}
\ No newline at end of file
+
+    private function removePortIfPresentInHttpHeader()
+    {
+        if (isset($_SERVER['HTTP_HOST'])
+            && preg_match("/(.*[^:]):([0-9]+)/", $_SERVER['HTTP_HOST'], $matches)
+        ) {
+            // 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'] = $matches[1];
+            $_SERVER['SERVER_PORT'] = $matches[2];
+        }
+    }
+}