Merge branch 'ACP2E-39' of https://github.com/magento-l3/magento2ce into ACP2E-39

Author: glo23503

app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php

@@ -107,36 +107,10 @@ protected function setUp(): void
         );
     }
 
-    /**
-     * Variation for UserIdentities.
-     *
-     * @return array
-     */
-    public function getUserIdentitiesCases(): array
-    {
-        return [
-            [
-                'customerId' => 1,
-                'visitorId' => null
-            ],
-            [
-                'customerId' => null,
-                'visitorId' => 33
-            ],
-            [
-                'customerId' => null,
-                'visitorId' => null
-            ],
-        ];
-    }
-
     /**
      * @inheritDoc
-     * @param int $customerId
-     * @param int $visitorId
-     * @dataProvider getUserIdentitiesCases
      */
-    public function testFilterProductActions(int $customerId = null, int $visitorId = null): void
+    public function testFilterProductActions(): void
     {
         $typeId = 'recently_compared_product';
         $productsData = [
@@ -175,16 +149,16 @@ public function testFilterProductActions(int $customerId = null, int $visitorId
             ->getMock();
         $this->sessionMock->expects($this->any())
             ->method('getCustomerId')
-            ->willReturn($customerId);
+            ->willReturn(1);
         $this->visitorMock->expects($this->exactly(2))
             ->method('getId')
-            ->willReturn($visitorId);
+            ->willReturn(34);
         $this->collectionFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($collection);
         $collection->expects($this->once())
             ->method('addFilterByUserIdentities')
-            ->with($customerId, $visitorId);
+            ->with(1, 34);
         $collection
             ->method('addFieldToFilter')
             ->withConsecutive(['type_id', $typeId], ['product_id', [1, 2]]);
@@ -201,8 +175,8 @@ public function testFilterProductActions(int $customerId = null, int $visitorId
                 [
                     [
                         'data' => [
-                            'visitor_id' => $visitorId,
-                            'customer_id' => $customerId,
+                            'visitor_id' => null,
+                            'customer_id' => 1,
                             'added_at' => 12,
                             'product_id' => 1,
                             'type_id' => 'recently_compared_product'
@@ -212,8 +186,8 @@ public function testFilterProductActions(int $customerId = null, int $visitorId
                 [
                     [
                         'data' => [
-                            'visitor_id' => $visitorId,
-                            'customer_id' => $customerId,
+                            'visitor_id' => null,
+                            'customer_id' => 1,
                             'added_at' => 13,
                             'product_id' => 2,
                             'type_id' => 'recently_compared_product'

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ProductFrontendAction/SynchronizerTest.php

@@ -8,6 +8,9 @@
 namespace Magento\Catalog\Model\Product\ProductFrontendAction;
 
 use Magento\Catalog\Model\ProductRepository;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Session;
+use Magento\Customer\Model\Visitor;
 
 /**
  * Test for \Magento\Catalog\Model\Product\ProductFrontendAction\Synchronizer.
@@ -30,17 +33,23 @@ class SynchronizerTest extends \PHPUnit\Framework\TestCase
      */
     private $productRepository;
 
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
     /**
      * @inheritDoc
      */
     protected function setUp(): void
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->session = $objectManager->get(\Magento\Customer\Model\Session::class);
-        $this->visitor = $objectManager->get(\Magento\Customer\Model\Visitor::class);
+        $this->session = $objectManager->get(Session::class);
+        $this->visitor = $objectManager->get(Visitor::class);
 
         $this->synchronizer = $objectManager->get(Synchronizer::class);
         $this->productRepository = $objectManager->get(ProductRepository::class);
+        $this->customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
     }
 
     /**
@@ -120,27 +129,23 @@ public function testSyncActionsWithoutActionsType(): void
     }
 
     /**
+     * Tests that product actions are returned correctly according to the provided customer or visitor.
+     *
+     * @param int|null $visitorId
+     * @param string|null $customerEmail
+     * @param int $expectedCollectionSize
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    public function testGetAllActionsWithoutCustomerAndVisitor(): void
-    {
-        $collection = $this->synchronizer->getAllActions();
-        $this->assertEquals($collection->getSize(), 0);
-    }
-
-    /**
+     * @dataProvider getAllActionsDataProvider
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
-     *
-     * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function testGetAllActionsOfVisitor(): void
+    public function testGetAllActions(?int $visitorId, ?string $customerEmail, int $expectedCollectionSize): void
     {
-        $this->visitor->setId(123);
+        $customerId = $customerEmail ? $this->customerRepository->get($customerEmail)->getId() : null;
+        $this->session->setCustomerId($customerId);
+        $this->visitor->setId($visitorId);
         $actionsType = 'recently_viewed_product';
         $productScope = 'website';
         $scopeId = 1;
@@ -161,61 +166,21 @@ public function testGetAllActionsOfVisitor(): void
 
         $this->synchronizer->syncActions($productsData, $actionsType);
         $collection = $this->synchronizer->getAllActions();
-        $this->assertEquals($collection->getSize(), 2);
+
+        $this->assertEquals($expectedCollectionSize, $collection->getSize());
     }
 
     /**
-     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
-     *
-     * @return void
+     * @return array[]
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function testGetAllActionsOfCustomer(): void
+    public function getAllActionsDataProvider()
     {
-        $customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Customer\Model\Customer::class);
-        /** @var \Magento\Customer\Model\Customer $customer */
-        $customer
-            ->setWebsiteId(1)
-            ->setId(1)
-            ->setEntityTypeId(1)
-            ->setAttributeSetId(1)
-            ->setEmail('customer@example.com')
-            ->setPassword('password')
-            ->setGroupId(1)
-            ->setStoreId(1)
-            ->setIsActive(1)
-            ->setFirstname('Firstname')
-            ->setLastname('Lastname')
-            ->setDefaultBilling(1)
-            ->setDefaultShipping(1);
-        $customer->isObjectNew(true);
-        $customer->save();
-
-        $this->session->setCustomerId(1);
-        $this->visitor->setId(null);
-        $actionsType = 'recently_viewed_product';
-        $productScope = 'website';
-        $scopeId = 1;
-        $product1 = $this->productRepository->get('simple');
-        $product2 = $this->productRepository->get('simple2');
-        $product1Id = $product1->getId();
-        $product2Id = $product2->getId();
-        $productsData = [
-            $productScope . '-' . $scopeId . '-' . $product1Id => [
-                'added_at' => '1576582660',
-                'product_id' => $product1Id,
-            ],
-            $productScope . '-' . $scopeId . '-' . $product2Id => [
-                'added_at' => '1576587153',
-                'product_id' => $product2Id,
-            ],
+        return [
+            ['visitorId' => null, 'customerEmail' => 'customer@example.com', 'expectedCollectionSize' => 2],
+            ['visitorId' => 123, 'customerEmail' => null, 'expectedCollectionSize' => 2],
+            ['visitorId' => null, 'customerEmail' => null, 'expectedCollectionSize' => 0],
         ];
-
-        $this->synchronizer->syncActions($productsData, $actionsType);
-        $collection = $this->synchronizer->getAllActions();
-        $this->assertEquals($collection->getSize(), 2);
     }
 }