MAGETWO-68845: Universal Analytics doesn't work when Cookie Restriction is enabled

Stanislav Idolov · Stanislav Idolov · commit c88dca761f80 · 2017-05-29T11:28:46.000+03:00
diff --git a/app/code/Magento/GoogleAnalytics/Block/Ga.php b/app/code/Magento/GoogleAnalytics/Block/Ga.php
@@ -184,7 +184,7 @@ public function isCookieRestrictionModeEnabled()
      *
      * @return int
      */
-    public function getCurrentWebsite()
+    public function getCurrentWebsiteId()
     {
         return $this->_storeManager->getWebsite()->getId();
     }
diff --git a/app/code/Magento/GoogleAnalytics/Test/Unit/Block/GaTest.php b/app/code/Magento/GoogleAnalytics/Test/Unit/Block/GaTest.php
@@ -128,13 +128,13 @@ public function testIsCookieRestrictionModeEnabled()
         $this->assertFalse($this->gaBlock->isCookieRestrictionModeEnabled());
     }
 
-    public function testGetCurrentWebsite()
+    public function testGetCurrentWebsiteId()
     {
         $websiteId = 100;
         $websiteMock = $this->getMockBuilder(\Magento\Store\Api\Data\WebsiteInterface::class)->getMock();
         $websiteMock->expects($this->once())->method('getId')->willReturn($websiteId);
         $this->storeManagerMock->expects($this->once())->method('getWebsite')->willReturn($websiteMock);
-        $this->assertEquals($websiteId, $this->gaBlock->getCurrentWebsite());
+        $this->assertEquals($websiteId, $this->gaBlock->getCurrentWebsiteId());
     }
 
     public function testOrderTrackingData()
diff --git a/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml b/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
@@ -14,8 +14,8 @@
 {
     "*": {
         "Magento_GoogleAnalytics/js/google-analytics": {
-            "isCookieRestrictionModeEnabled": <?php /* @escapeNotVerified */ echo (int)$block->isCookieRestrictionModeEnabled(); ?>,
-            "currentWebsite": <?php /* @escapeNotVerified */ echo (int)$block->getCurrentWebsite(); ?>,
+            "isCookieRestrictionModeEnabled": <?php echo (int)$block->isCookieRestrictionModeEnabled(); ?>,
+            "currentWebsite": <?php echo (int)$block->getCurrentWebsiteId(); ?>,
             "cookieName": "<?php /* @escapeNotVerified */ echo \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE; ?>",
             "ordersTrackingData": <?php /* @escapeNotVerified */ echo json_encode($block->getOrdersTrackingData()); ?>,
             "pageTrackingData": <?php /* @escapeNotVerified */ echo json_encode($block->getPageTrackingData($accountId)); ?>

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public function isCookieRestrictionModeEnabled()`
`184`	`184`	`*`
`185`	`185`	`* @return int`
`186`	`186`	`*/`
`187`		`- public function getCurrentWebsite()`
	`187`	`+ public function getCurrentWebsiteId()`
`188`	`188`	`{`
`189`	`189`	`return $this->_storeManager->getWebsite()->getId();`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,13 +128,13 @@ public function testIsCookieRestrictionModeEnabled()`
`128`	`128`	`$this->assertFalse($this->gaBlock->isCookieRestrictionModeEnabled());`
`129`	`129`	`}`
`130`	`130`
`131`		`- public function testGetCurrentWebsite()`
	`131`	`+ public function testGetCurrentWebsiteId()`
`132`	`132`	`{`
`133`	`133`	`$websiteId = 100;`
`134`	`134`	`$websiteMock = $this->getMockBuilder(\Magento\Store\Api\Data\WebsiteInterface::class)->getMock();`
`135`	`135`	`$websiteMock->expects($this->once())->method('getId')->willReturn($websiteId);`
`136`	`136`	`$this->storeManagerMock->expects($this->once())->method('getWebsite')->willReturn($websiteMock);`
`137`		`- $this->assertEquals($websiteId, $this->gaBlock->getCurrentWebsite());`
	`137`	`+ $this->assertEquals($websiteId, $this->gaBlock->getCurrentWebsiteId());`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`public function testOrderTrackingData()`