From 896b80b9df2507fe806a51f1dc85cd1f05fa60a5 Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Wed, 21 Nov 2012 21:31:28 +0000
Subject: [PATCH] Trying again
git-svn-id: http://dev.piwik.org/svn/trunk@7511 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
.../TwoVisitors_TwoWebsites_DifferentDaysTest.php | 5 ++++-
...tors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php | 4 +++-
...woVisitors_TwoWebsites_DifferentDays_ConversionsTest.php | 4 +++-
tests/PHPUnit/Plugins/PrivacyManagerTest.php | 6 +++++-
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php
index 2fcbc697d3..4c8b59a216 100755
--- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php
@@ -161,7 +161,10 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Integ
// Second new visitor on Idsite 1: one page view
$visitorB = self::getTracker($idSite, $dateTime, $defaultInit = true);
$visitorB->enableBulkTracking();
- $visitorB->setTokenAuth(self::getTokenAuth());
+ // calc token auth by hand in test environment
+ $tokenAuth = md5(
+ Piwik_Config::getInstance()->superuser['login'] . Piwik_Config::getInstance()->superuser['password']);
+ $visitorB->setTokenAuth($tokenAuth);
$visitorB->setIp('100.52.156.83');
$visitorB->setResolution(800, 300);
$visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime());
diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php
index 7efe285ce1..cf0d96dbf2 100755
--- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php
@@ -113,7 +113,9 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisa
$visitorB = self::getTracker($idSite, $dateTime, $defaultInit = true);
$visitorB->enableBulkTracking();
// calc token auth by hand in test environment
- $visitorB->setTokenAuth(self::getTokenAuth());
+ $tokenAuth = md5(
+ Piwik_Config::getInstance()->superuser['login'] . Piwik_Config::getInstance()->superuser['password']);
+ $visitorB->setTokenAuth($tokenAuth);
$visitorB->setIp('100.52.156.83');
$visitorB->setResolution(800, 300);
$visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime());
diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php
index c185025939..c70a5fa2d9 100755
--- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php
+++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php
@@ -155,7 +155,9 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_Conversions e
$visitorB = self::getTracker($idSite, $dateTime, $defaultInit = true);
$visitorB->enableBulkTracking();
// calc token auth by hand in test environment
- $visitorB->setTokenAuth(self::getTokenAuth());
+ $tokenAuth = md5(
+ Piwik_Config::getInstance()->superuser['login'] . Piwik_Config::getInstance()->superuser['password']);
+ $visitorB->setTokenAuth($tokenAuth);
$visitorB->setIp('100.52.156.83');
$visitorB->setResolution(800, 300);
$visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime());
diff --git a/tests/PHPUnit/Plugins/PrivacyManagerTest.php b/tests/PHPUnit/Plugins/PrivacyManagerTest.php
index 2e13a3b705..4352179a59 100755
--- a/tests/PHPUnit/Plugins/PrivacyManagerTest.php
+++ b/tests/PHPUnit/Plugins/PrivacyManagerTest.php
@@ -620,7 +620,11 @@ class PrivacyManagerTest extends IntegrationTestCase
$t = IntegrationTestCase::getTracker(self::$idSite, $start, $defaultInit = true);
$t->enableBulkTracking();
- $t->setTokenAuth(self::getTokenAuth());
+ // calc token auth by hand in test environment
+ $tokenAuth = md5(
+ Piwik_Config::getInstance()->superuser['login'] . Piwik_Config::getInstance()->superuser['password']);
+ $t->setTokenAuth($tokenAuth);
+
for ($daysAgo = self::$daysAgoStart; $daysAgo >= 0; $daysAgo -= 5) // one visit every 5 days
{
$dateTime = $start->subDay($daysAgo)->toString();
--
GitLab