make sure the UI tests run on all hosts

matomo-org · Jan 16, 2014 · 6a1cd04 · mattab · Mar 3, 2014 · 6a1cd04
1 parent 4b10f39
commit 6a1cd04
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/plugins/ExamplePlugin/tests/fixtures/SimpleFixtureTrackFewVisits.php b/plugins/ExamplePlugin/tests/fixtures/SimpleFixtureTrackFewVisits.php
@@ -33,8 +33,10 @@ public function tearDown()
 
     private function setUpWebsite()
     {
-        $idSite = self::createWebsite($this->dateTime, $ecommerce = 1);
-        $this->assertTrue($idSite === $this->idSite);
+        if (!self::siteCreated($this->idSite)) {
+            $idSite = self::createWebsite($this->dateTime, $ecommerce = 1);
+            $this->assertSame($this->idSite, $idSite);
+        }
     }
 
     protected function trackFirstVisit()

diff --git a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
@@ -17,16 +17,19 @@ class Test_Piwik_Fixture_SomeVisitsCustomVariablesCampaignsNotHeuristics extends
     public $dateTime = '2009-01-04 00:11:42';
     public $idSite = 1;
     public $idGoal = 1;
+    private $tmpHost = '';
 
     public function setUp()
     {
+        $this->tmpHost = $_SERVER['HTTP_HOST'];
+        $_SERVER['HTTP_HOST'] = 'localhost';
         $this->setUpWebsitesAndGoals();
         $this->trackVisits();
     }
 
     public function tearDown()
     {
-        // empty
+        $_SERVER['HTTP_HOST'] = $this->tmpHost;
     }
 
     private function setUpWebsitesAndGoals()