Merge branch 'MC-29755-2' of https://github.com/magento-tango/magento2ce into MC-29755-2.4.1

� Conflicts:
�	app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php

Author: Oleksandr Iegorov

app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php

@@ -1,75 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ConfigurableProduct\Test\Unit\Model\Plugin\Frontend;
-
-use Magento\Catalog\Model\Product;
-use Magento\ConfigurableProduct\Model\Plugin\Frontend\ProductIdentitiesExtender;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use PHPUnit\Framework\TestCase;
-
-class ProductIdentitiesExtenderTest extends TestCase
-{
-    /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|Configurable
-     */
-    private $configurableTypeMock;
-
-    /**
-     * @var ProductIdentitiesExtender
-     */
-    private $plugin;
-
-    /** @var  MockObject|Product */
-    private $product;
-
-    protected function setUp(): void
-    {
-        $this->product = $this->getMockBuilder(Product::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getId'])
-            ->getMock();
-
-        $this->configurableTypeMock = $this->getMockBuilder(Configurable::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->plugin = new ProductIdentitiesExtender($this->configurableTypeMock);
-    }
-
-    public function testAfterGetIdentities()
-    {
-        $identities = [
-            'SomeCacheId',
-            'AnotherCacheId',
-        ];
-        $productId = 12345;
-        $childIdentities = [
-            0 => [1, 2, 5, 100500]
-        ];
-        $expectedIdentities = [
-            'SomeCacheId',
-            'AnotherCacheId',
-            Product::CACHE_TAG . '_' . 1,
-            Product::CACHE_TAG . '_' . 2,
-            Product::CACHE_TAG . '_' . 5,
-            Product::CACHE_TAG . '_' . 100500,
-        ];
-
-        $this->product->expects($this->once())
-            ->method('getId')
-            ->willReturn($productId);
-
-        $this->configurableTypeMock->expects($this->once())
-            ->method('getChildrenIds')
-            ->with($productId)
-            ->willReturn($childIdentities);
-
-        $productIdentities = $this->plugin->afterGetIdentities($this->product, $identities);
-        $this->assertEquals($expectedIdentities, $productIdentities);
-    }
-}

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php

@@ -10,9 +10,6 @@
     <type name="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface">
         <plugin name="Magento_ConfigurableProduct_Plugin_Model_ResourceModel_Attribute_InStockOptionSelectBuilder" type="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\InStockOptionSelectBuilder"/>
     </type>
-    <type name="Magento\Catalog\Model\Product">
-        <plugin name="product_identities_extender" type="Magento\ConfigurableProduct\Model\Plugin\Frontend\ProductIdentitiesExtender" />
-    </type>
     <type name="Magento\ConfigurableProduct\Model\Product\Type\Configurable">
         <plugin name="used_products_cache" type="Magento\ConfigurableProduct\Model\Plugin\Frontend\UsedProductsCache" />
     </type>

app/code/Magento/ConfigurableProduct/etc/frontend/di.xml

@@ -13,16 +13,37 @@
 class ProductTest extends \PHPUnit\Framework\TestCase
 {
     /**
+     * Check that no children identities are added to the parent product in frontend area
+     *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoAppArea frontend
+     * @return void
      */
-    public function testGetIdentities()
+    public function testGetIdentitiesForConfigurableProductOnStorefront(): void
     {
         $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-        $confProduct = $productRepository->get('configurable');
-        $simple10Product = $productRepository->get('simple_10');
-        $simple20Product = $productRepository->get('simple_20');
+        $configurableProduct = $productRepository->get('configurable');
+        $expectedIdentities = [
+            'cat_p_' . $configurableProduct->getId(),
+            'cat_p'
+        ];
+        $this->assertEquals($expectedIdentities, $configurableProduct->getIdentities());
+    }
 
-        $this->assertEmpty(array_diff($confProduct->getIdentities(), $simple10Product->getIdentities()));
-        $this->assertEmpty(array_diff($confProduct->getIdentities(), $simple20Product->getIdentities()));
+    /**
+     * Check that no children identities are added to the parent product in frontend area
+     *
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoAppArea adminhtml
+     * @return void
+     */
+    public function testGetIdentitiesForConfigurableProductInAdminArea(): void
+    {
+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $configurableProduct = $productRepository->get('configurable');
+        $expectedIdentities = [
+            'cat_p_' . $configurableProduct->getId(),
+        ];
+        $this->assertEquals($expectedIdentities, $configurableProduct->getIdentities());
     }
 }