Merge pull request #6407 from piwik/6110_cdt

setting 'cdt' tracker parameter in recent past (in the last 4 hours) should not require token_auth   	fixes #6110 

6 files changed, 22 insertions, 13 deletions

diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php
index afa0a6a4bc..ecddbe5c9f 100755
--- a/tests/LocalTracker.php
+++ b/tests/LocalTracker.php
@@ -45,8 +45,6 @@ class Piwik_LocalTracker extends PiwikTracker
 
         // unset cached values
         Cache::$trackerCache = null;
-        Tracker::setForceIp(null);
-        Tracker::setForceDateTime(null);
 
         // save some values
         $plugins = Config::getInstance()->Plugins['Plugins'];
diff --git a/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php b/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php
index 7a316bcc78..ba1f56d207 100644
--- a/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php
+++ b/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php
@@ -41,7 +41,7 @@ class OneVisitWithAbnormalPageviewUrls extends Fixture
     {
         $dateTime = $this->dateTime;
         $idSite = $this->idSite;
-        $t = self::getTracker($idSite, $dateTime, $defaultInit = true, $useThirdPartyCookie = 1);
+        $t = self::getTracker($idSite, $dateTime, $defaultInit = true);
 
         $t->setUrlReferrer('http://www.google.com/search?q=piwik');
         $t->setUrl('http://example.org/foo/bar.html');
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
index 4896e6fe2a..adc6b2e3e0 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
@@ -63,6 +63,7 @@ class SomeVisitsCustomVariablesCampaignsNotHeuristics extends Fixture
 
         // Create a new Tracker object, with different attributes
         $t2 = self::getTracker($idSite, $dateTime, $defaultInit = false);
+        $t2->setTokenAuth(self::getTokenAuth());
 
         // Make sure the ID is different at first
         $visitorId2 = $t2->getVisitorId();
diff --git a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
index 8e68ab6610..e8756f67a9 100644
--- a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
+++ b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
@@ -43,19 +43,31 @@ class BackwardsCompatibility1XTest extends IntegrationTestCase
             Db::query("TRUNCATE TABLE " . Common::prefixTable($table));
         }
 
-        // add two visits from same visitor on dec. 29
-        $t = Fixture::getTracker(1, '2012-12-29 01:01:30', $defaultInit = true);
+        self::trackTwoVisitsOnSameDay();
+
+        // launch archiving
+        VisitFrequencyApi::getInstance()->get(1, 'year', '2012-12-29');
+    }
+
+
+    /**
+     * add two visits from same visitor on dec. 29
+     */
+    private static function trackTwoVisitsOnSameDay()
+    {
+        $t = Fixture::getTracker(1, '2012-12-29 01:01:30', $defaultInit = true, $useLocal = true);
+        $t->enableBulkTracking();
+
         $t->setUrl('http://site.com/index.htm');
         $t->setIp('136.5.3.2');
-        Fixture::checkResponse($t->doTrackPageView('incredible title!'));
+        $t->doTrackPageView('incredible title!');
 
         $t->setForceVisitDateTime('2012-12-29 03:01:30');
         $t->setUrl('http://site.com/other/index.htm');
         $t->DEBUG_APPEND_URL = '&_idvc=2'; // make sure visit is marked as returning
-        Fixture::checkResponse($t->doTrackPageView('other incredible title!'));
+        $t->doTrackPageView('other incredible title!');
 
-        // launch archiving
-        VisitFrequencyApi::getInstance()->get(1, 'year', '2012-12-29');
+        $t->doBulkTrack();
     }
 
     /**
diff --git a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
index 02b3f1e8c1..792ccbbc3f 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
+++ b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
@@ -20,6 +20,7 @@ use Piwik\Plugin\Manager as PluginManager;
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @group Core
+ * @group ActionTest
  */
 class Core_Tracker_ActionTest extends DatabaseTestCase
 {
diff --git a/tests/PHPUnit/Integration/Core/Tracker/Visit2Test.php b/tests/PHPUnit/Integration/Core/Tracker/Visit2Test.php
index 7c3b2e9ed5..de9d0810ec 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/Visit2Test.php
+++ b/tests/PHPUnit/Integration/Core/Tracker/Visit2Test.php
@@ -134,6 +134,7 @@ class FakeTrackerVisit extends \Piwik\Tracker\Visit
 
 /**
  * @group Core
+ * @group VisitTest
  */
 class VisitTest extends DatabaseTestCase
 {
@@ -156,7 +157,6 @@ class VisitTest extends DatabaseTestCase
     public function test_handleNewVisitWithoutConversion_shouldTriggerDimensions()
     {
         $request = new \Piwik\Tracker\Request(array());
-        $request->setForceIp('127.0.0.1');
         $visitor = new \Piwik\Tracker\Visitor($request, '');
 
         $visit = new FakeTrackerVisit($request);
@@ -179,7 +179,6 @@ class VisitTest extends DatabaseTestCase
     public function test_handleNewVisitWithConversion_shouldTriggerDimensions()
     {
         $request = new \Piwik\Tracker\Request(array());
-        $request->setForceIp('127.0.0.1');
         $visitor = new \Piwik\Tracker\Visitor($request, '');
 
         $visit = new FakeTrackerVisit($request);
@@ -198,7 +197,6 @@ class VisitTest extends DatabaseTestCase
     public function test_handleExistingVisitWithoutConversion_shouldTriggerDimensions()
     {
         $request = new \Piwik\Tracker\Request(array());
-        $request->setForceIp('127.0.0.1');
         $visitor = new \Piwik\Tracker\Visitor($request, '');
 
         $visit = new FakeTrackerVisit($request);
@@ -222,7 +220,6 @@ class VisitTest extends DatabaseTestCase
     public function test_handleExistingVisitWithConversion_shouldTriggerDimensions()
     {
         $request = new \Piwik\Tracker\Request(array());
-        $request->setForceIp('127.0.0.1');
         $visitor = new \Piwik\Tracker\Visitor($request, '');
 
         $visit = new FakeTrackerVisit($request);