1 files changed, 15 insertions, 4 deletions

diff --git a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
index f596684d92..f4eb5d799b 100644
--- a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
+++ b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
@@ -9,6 +9,7 @@
 namespace Piwik\Tests\Integration\Tracker;
 
 use Piwik\Piwik;
+use Piwik\Plugins\SitesManager\SitesManager;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 use Piwik\Tracker\TrackerCodeGenerator;
 
@@ -21,18 +22,28 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
     {
         $generator = new TrackerCodeGenerator();
 
-        $jsTag = $generator->generate($idSite = 1, $piwikUrl = 'http://localhost/piwik',
+        $urls = array(
+            'http://localhost/piwik',
+            'http://another-domain/piwik',
+            'https://another-domain/piwik'
+        );
+        $idSite = \Piwik\Plugins\SitesManager\API::getInstance()->addSite('Site name here <-->', $urls);
+        $jsTag = $generator->generate($idSite, 'http://piwik-server/piwik',
             $mergeSubdomains = true, $groupPageTitlesByDomain = true, $mergeAliasUrls = true,
             $visitorCustomVariables = array(array("name", "value"), array("name 2", "value 2")),
             $pageCustomVariables = array(array("page cvar", "page cvar value")),
             $customCampaignNameQueryParam = "campaignKey", $customCampaignKeywordParam = "keywordKey",
-            $doNotTrack = true, $disableCookies = false, $trackNoScript = true);
+            $doNotTrack = true, $disableCookies = false, $trackNoScript = true,
+            $crossDomain = true);
 
         $expected = "&lt;!-- Piwik --&gt;
 &lt;script type=&quot;text/javascript&quot;&gt;
   var _paq = _paq || [];
   // tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot;
   _paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]);
+  _paq.push([\"setCookieDomain\", \"*.localhost\"]);
+  _paq.push([\"setDomains\", [\"*.localhost/piwik\",\"*.another-domain/piwik\",\"*.another-domain/piwik\"]]);
+  _paq.push([\"enableCrossDomainLinking\"]);
   // you can set up to 5 custom variables for each visitor
   _paq.push([\"setCustomVariable\", 1, \"name\", \"value\", \"visit\"]);
   _paq.push([\"setCustomVariable\", 2, \"name 2\", \"value 2\", \"visit\"]);
@@ -44,14 +55,14 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
   (function() {
-    var u=&quot;//localhost/piwik/&quot;;
+    var u=&quot;//piwik-server/piwik/&quot;;
     _paq.push(['setTrackerUrl', u+'piwik.php']);
     _paq.push(['setSiteId', '1']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
     g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
   })();
 &lt;/script&gt;
-&lt;noscript&gt;&lt;p&gt;&lt;img src=&quot;//localhost/piwik/piwik.php?idsite=1&amp;rec=1&quot; style=&quot;border:0;&quot; alt=&quot;&quot; /&gt;&lt;/p&gt;&lt;/noscript&gt;
+&lt;noscript&gt;&lt;p&gt;&lt;img src=&quot;//piwik-server/piwik/piwik.php?idsite=1&amp;rec=1&quot; style=&quot;border:0;&quot; alt=&quot;&quot; /&gt;&lt;/p&gt;&lt;/noscript&gt;
 &lt;!-- End Piwik Code --&gt;
 ";