Merge remote-tracking branch 'tango-ce/MAGETWO-17189' into Tango_Pull_Request_Bug_Fixing

Author: Yuri Kovsher

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

@@ -215,9 +215,13 @@ public function catalogProductCompareClear(\Magento\Framework\Event\Observer $ob
     public function catalogProductCompareAddProduct(\Magento\Framework\Event\Observer $observer)
     {
         $productId = $observer->getEvent()->getProduct()->getId();
-
-        $this->_productCompFactory->create()->setProductId($productId)->save()->calculate();
-
+        $viewData = ['product_id' => $productId];
+        if ($this->_customerSession->isLoggedIn()) {
+            $viewData['customer_id'] = $this->_customerSession->getCustomerId();
+        } else {
+            $viewData['visitor_id'] = $this->_customerVisitor->getId();
+        }
+        $this->_productCompFactory->create()->setData($viewData)->save()->calculate();
         return $this->_event(\Magento\Reports\Model\Event::EVENT_PRODUCT_COMPARE, $productId);
     }
 

dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php

@@ -36,6 +36,16 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
      */
     protected $storeMock;
 
+    /**
+     * @var \Magento\Reports\Model\Product\Index\ComparedFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $productCompFactoryMock;
+
+    /**
+     * @var \Magento\Reports\Model\Product\Index\Compared|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $productCompModelMock;
+
     public function setUp()
     {
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
@@ -73,13 +83,21 @@ public function setUp()
         $storeManager->expects($this->any())
             ->method('getStore')
             ->willReturn($this->storeMock);
+        $this->productCompFactoryMock = $this->getMockBuilder('Magento\Reports\Model\Product\Index\ComparedFactory')
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->productCompModelMock = $this->getMockBuilder('Magento\Reports\Model\Product\Index\Compared')
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->observer = $objectManager->getObject(
             'Magento\Reports\Model\Event\Observer',
             [
                 'customerSession' => $this->customerSessionMock,
                 'customerVisitor' => $this->customerVisitorMock,
                 'productIndxFactory' => $productIndexFactoryMock,
+                'productCompFactory' => $this->productCompFactoryMock,
                 'storeManager' => $storeManager,
                 'event' => $reportEventFactory
             ]
@@ -158,6 +176,63 @@ public function testCatalogProductViewVisitor()
         $this->observer->catalogProductView($eventObserver);
     }
 
+    /**
+     * @param bool $isLoggedIn
+     * @param str $userKey
+     * @param int $userId
+     * @dataProvider catalogProductCompareAddProductDataProvider
+     */
+    public function testCatalogProductCompareAddProduct($isLoggedIn, $userKey, $userId)
+    {
+        $productId = 111;
+        $customerId = 222;
+        $visitorId = 333;
+        $viewData = [
+            'product_id' => $productId,
+            $userKey => $userId
+        ];
+        $observerMock = $this->getObserverMock($productId);
+        $this->customerSessionMock->expects($this->any())
+            ->method('isLoggedIn')
+            ->willReturn($isLoggedIn);
+        $this->customerSessionMock->expects($this->any())
+            ->method('getCustomerId')
+            ->willReturn($customerId);
+        $this->customerVisitorMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($visitorId);
+        $this->productCompFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->productCompModelMock);
+        $this->productCompModelMock->expects($this->any())
+            ->method('setData')
+            ->with($viewData)
+            ->willReturnSelf();
+        $this->productCompModelMock->expects($this->any())
+            ->method('save')
+            ->willReturnSelf();
+        $this->productCompModelMock->expects($this->any())
+            ->method('calculate')
+            ->willReturnSelf();
+        $this->assertEquals($this->observer, $this->observer->catalogProductCompareAddProduct($observerMock));
+    }
+
+    public function catalogProductCompareAddProductDataProvider()
+    {
+        return [
+            'logged in' => [
+                'isLoggedIn' => true,
+                'userKey' => 'customer_id',
+                'userId' => 222
+            ],
+            'not logged in' => [
+                'isLoggedIn' => false,
+                'userKey' => 'visitor_id',
+                'userId' => 333
+            ]
+        ];
+    }
+
     /**
      * @param array $expectedViewedData
      * @return void