Merge remote-tracking branch 'origin/MAGETWO-39614' into BUGS

Author: slavvka

app/code/Magento/Reports/Model/Event/Observer.php

@@ -151,7 +151,7 @@ public function catalogProductView(\Magento\Framework\Event\Observer $observer)
         $productId = $observer->getEvent()->getProduct()->getId();
 
         $viewData['product_id'] = $productId;
-
+        $viewData['store_id']   = $this->_storeManager->getStore()->getId();
         if ($this->_customerSession->isLoggedIn()) {
             $viewData['customer_id'] = $this->_customerSession->getCustomerId();
         } else {

app/code/Magento/Reports/Test/Unit/Model/Event/ObserverTest.php

@@ -85,7 +85,6 @@ public function setUp()
 
         /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject $storeManager */
         $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
-
         $this->storeMock = $this->getMockBuilder('\Magento\Store\Model\Store')
             ->disableOriginalConstructor()->getMock();
 
@@ -128,7 +127,8 @@ public function testCatalogProductViewCustomer()
         $storeId = 1;
         $expectedViewedData = [
             'product_id' => $productId,
-            'customer_id' => $customerId
+            'customer_id' => $customerId,
+            'store_id' => $storeId,
         ];
 
         $expectedEventData = [
@@ -160,7 +160,8 @@ public function testCatalogProductViewVisitor()
         $storeId = 1;
         $expectedViewedData = [
             'product_id' => $productId,
-            'visitor_id' => $visitorId
+            'visitor_id' => $visitorId,
+            'store_id' => $storeId,
         ];
 
         $expectedEventData = [