merge magento/2.4-develop into magento-tsg/2.4-develop-com-pr12

Author: magento-mts-svc

.github/ISSUE_TEMPLATE/story.md

@@ -0,0 +1,14 @@
+---
+name: GraphQL Story
+about: User story for GraphQL project
+labels: 'Project: GraphQL'
+
+---
+
+*As a ___ I want to ___ so that ___.*
+
+### AC
+* a
+* b
+### Approved Schema
+* a

app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.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/Test/Unit/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php

@@ -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());
     }
 }