Add IP addresses to visits in UITestFixture and make sure to use full IPs + PHP geoip provider.

1 files changed, 25 insertions, 1 deletions

diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php
index bfec588831..7caf721bbd 100644
--- a/tests/PHPUnit/Fixtures/UITestFixture.php
+++ b/tests/PHPUnit/Fixtures/UITestFixture.php
@@ -16,7 +16,9 @@ use Piwik\Db;
 use Piwik\DbHelper;
 use Piwik\FrontController;
 use Piwik\Option;
+use Piwik\Plugins\PrivacyManager\IPAnonymizer;
 use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
+use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\Plugins\UsersManager\API as UsersManagerAPI;
 use Piwik\Plugins\SitesManager\API as SitesManagerAPI;
 use Piwik\Tests\Framework\Fixture;
@@ -49,6 +51,10 @@ class UITestFixture extends SqlDump
             "idsite = 1"
         );
 
+        // for proper geolocation
+        LocationProvider::setCurrentProvider(LocationProvider\GeoIp\Php::ID);
+        IPAnonymizer::deactivate();
+
         $this->addOverlayVisits();
         $this->addNewSitesForSiteSelector();
 
@@ -107,13 +113,31 @@ class UITestFixture extends SqlDump
             array('page-6.html', 'page-3.html', ''),
         );
 
+        $ips = array( // ip's chosen for geolocation data
+            "20.56.34.67",
+            "24.17.88.121",
+            "24.12.45.67",
+            "24.120.12.5",
+            "24.100.12.5",
+            "24.110.12.5",
+            "24.17.88.122",
+            "24.12.45.68",
+            "24.17.88.123",
+            "24.18.127.34",
+            "18.50.45.71",
+            "24.20.127.34",
+            "24.23.40.34",
+            "18.50.45.70",
+            "24.50.12.5",
+        );
+
         $date = Date::factory('yesterday');
         $t = self::getTracker($idSite = 3, $dateTime = $date->getDatetime(), $defaultInit = true);
         $t->enableBulkTracking();
 
         foreach ($visitProfiles as $visitCount => $visit) {
             $t->setNewVisitorId();
-            $t->setIp("123.234.23.$visitCount");
+            $t->setIp($ips[$visitCount]);
 
             foreach ($visit as $idx => $action) {
                 $t->setForceVisitDateTime($date->addHour($visitCount)->addHour(0.01 * $idx)->getDatetime());