From dd9ec8712f10024cd4536ec9f15f98002980ea8d Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Wed, 12 Mar 2014 14:54:55 +1300
Subject: [PATCH] Reuse the default tracker cookie path in tests
---
libs/PiwikTracker/PiwikTracker.php | 4 +++-
.../SomeVisitsCustomVariablesCampaignsNotHeuristics.php | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/libs/PiwikTracker/PiwikTracker.php b/libs/PiwikTracker/PiwikTracker.php
index ab90778899..ec7cdcb437 100644
--- a/libs/PiwikTracker/PiwikTracker.php
+++ b/libs/PiwikTracker/PiwikTracker.php
@@ -148,6 +148,8 @@ class PiwikTracker
const CVAR_INDEX_ECOMMERCE_ITEM_NAME = 4;
const CVAR_INDEX_ECOMMERCE_ITEM_CATEGORY = 5;
+ const DEFAULT_COOKIE_PATH = '/';
+
/**
* Builds a PiwikTracker object, used to track visits, pages and Goal conversions
* for a specific website, by using the Piwik Tracking API.
@@ -200,7 +202,7 @@ class PiwikTracker
$this->setNewVisitorId();
$this->configCookiesDisabled = false;
- $this->configCookiePath = '/';
+ $this->configCookiePath = self::DEFAULT_COOKIE_PATH;
$this->configCookieDomain = '';
$this->currentTs = time();
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
index 0088f40fca..fd587ff2bc 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php
@@ -127,7 +127,8 @@ class Test_Piwik_Fixture_SomeVisitsCustomVariablesCampaignsNotHeuristics extends
private function getFirstPartyCookieDomainHash()
{
$host = \Piwik\Url::getHost();
- return substr(sha1( $host . '/'), 0, 4);
+ $cookiePath = PiwikTracker::DEFAULT_COOKIE_PATH;
+ return substr(sha1( $host . $cookiePath), 0, 4);
}
/**
--
GitLab