Re-add Visitor Profile screenshot by making omniFixture work with deterministic visitor id for the screenshot

2 files changed, 8 insertions, 5 deletions

diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
index ea78fba9c1..9478a64ea7 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
@@ -23,7 +23,6 @@ require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixtures/ManySitesImportedLogs
 class Test_Piwik_Fixture_ManySitesImportedLogsWithXssAttempts extends Test_Piwik_Fixture_ManySitesImportedLogs
 {
     public $now = null;
-    public $visitorIdForDeterministicDate = null;
 
     public function __construct()
     {
@@ -36,10 +35,6 @@ class Test_Piwik_Fixture_ManySitesImportedLogsWithXssAttempts extends Test_Piwik
 
         $this->trackVisitsForRealtimeMap(Date::factory('2012-08-11 11:22:33'), $createSeperateVisitors = false);
 
-        $this->visitorIdForDeterministicDate = bin2hex(Db::fetchOne(
-            "SELECT idvisitor FROM " . Common::prefixTable('log_visit')
-          . " WHERE idsite = 2 AND location_latitude IS NOT NULL LIMIT 1"));
-
         $this->setupDashboards();
         $this->setupXssSegment();
         $this->addAnnotations();
diff --git a/tests/PHPUnit/Fixtures/OmniFixture.php b/tests/PHPUnit/Fixtures/OmniFixture.php
index 061f2f4e4b..7b2c117334 100644
--- a/tests/PHPUnit/Fixtures/OmniFixture.php
+++ b/tests/PHPUnit/Fixtures/OmniFixture.php
@@ -20,6 +20,9 @@ class Test_Piwik_Fixture_OmniFixture extends Test_Piwik_BaseFixture
     public $dateTime = '2012-02-01';
     public $now = null;
 
+    // Visitor profile screenshot test needs visitor id
+    public $visitorIdDeterministic = null;
+
     public $fixtures = array();
 
     /**
@@ -70,6 +73,11 @@ class Test_Piwik_Fixture_OmniFixture extends Test_Piwik_BaseFixture
         foreach ($this->fixtures as $name => $fixture) {
             $fixture->setUp();
         }
+
+        $this->visitorIdDeterministic = bin2hex(\Piwik\Db::fetchOne(
+            "SELECT idvisitor FROM " . \Piwik\Common::prefixTable('log_visit')
+            . " WHERE idsite = 2 AND location_latitude IS NOT NULL LIMIT 1"));
+
     }
 
     public function tearDown()