Merge pull request #6258 from a4tunado/6257

refs #6257 visitorUUID equal by default for each new Piwik.Tracker
matomo-org · Sep 26, 2014 · 3396d9b · 3396d9b
2 parents 37d677d + 47f6987
commit 3396d9b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/js/piwik.js b/js/piwik.js
@@ -2113,7 +2113,7 @@ if (typeof Piwik !== 'object') {
          *
          * See: Tracker.setTrackerUrl() and Tracker.setSiteId()
          */
-        function Tracker(trackerUrl, siteId) {
+        function Tracker(trackerUrl, siteId, uuid) {
 
             /************************************************************
              * Private members
@@ -2288,7 +2288,7 @@ if (typeof Piwik !== 'object') {
                 domainHash,
 
                 // Visitor UUID
-                visitorUUID;
+                visitorUUID = uuid;
 
             /*
              * Set cookie value
@@ -5134,7 +5134,7 @@ if (typeof Piwik !== 'object') {
              * @return Tracker
              */
             getTracker: function (piwikUrl, siteId) {
-                return new Tracker(piwikUrl, siteId);
+                return new Tracker(piwikUrl, siteId, asyncTracker.getVisitorId());
             },
 
             /**

diff --git a/tests/javascript/index.php b/tests/javascript/index.php
@@ -2005,6 +2005,32 @@ function assertTrackingRequest(actual, expectedStartsWith, message)
         ok( !tracker.hook.test._isString(function () { }), 'isString(function)' );
         ok( tracker.hook.test._isString(new String), 'isString(String)' ); // String is a string
     });
+
+    test("Default visitorId should be equal across Trackers", function() {
+        expect(4);
+
+        deleteCookies();
+
+        var asyncTracker = Piwik.getAsyncTracker();
+        var asyncVistorId = asyncTracker.getVisitorId();
+        equal(Piwik.getAsyncTracker().getVisitorId(), asyncVistorId, 'asyncVistorId');
+
+        wait(2000);
+
+        var delayedTracker = Piwik.getTracker();
+        var delayedVisitorId = delayedTracker.getVisitorId();
+        equal(Piwik.getAsyncTracker().getVisitorId(), delayedVisitorId, 'delayedVisitorId');
+
+        var prefixTracker = Piwik.getTracker();
+        prefixTracker.setCookieNamePrefix('_test_cookie_prefix');
+
+        var prefixVisitorId = prefixTracker.getVisitorId();
+        equal(Piwik.getAsyncTracker().getVisitorId(), prefixVisitorId, 'prefixVisitorId');
+
+        var customTracker = Piwik.getTracker('customTrackerUrl', '71');
+        var customVisitorId = customTracker.getVisitorId();
+        equal(Piwik.getAsyncTracker().getVisitorId(), customVisitorId, 'customVisitorId');
+    });
 
     test("AnalyticsTracker alias", function() {
         expect(1);
@@ -2026,7 +2052,7 @@ function assertTrackingRequest(actual, expectedStartsWith, message)
         equal( tracker.hook.test._decode("%26%3D%3F%3B%2F%23"), '&=?;/#', 'decodeWrapper()' );
         equal( tracker.hook.test._urldecode("mailto:%69%6e%66%6f@%65%78%61%6d%70%6c%65.%63%6f%6d"), 'mailto:info@example.com', 'decodeWrapper()' );
     });
-
+    
     test("Tracker getHostName(), getParameter(), urlFixup(), domainFixup(), titleFixup() and purify()", function() {
         expect(57);