MC-29130: Storefront: View configurable product on storefront

ysapiga · ysapiga · commit 6d5c701c970a · 2019-12-20T11:41:39.000+02:00
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableTest.php
@@ -153,14 +153,14 @@ public function expectedDataProvider(): array
      * @param array $expectedData
      * @return void
      */
-    protected function assertConfig(array $data, array $expectedData): void
+    private function assertConfig(array $data, array $expectedData): void
     {
         $this->assertEquals($expectedData['label'], $data['label']);
         foreach ($expectedData['options'] as $expectedOption) {
             $found = false;
             foreach ($data['options'] as $option) {
-                $expectedProductId = $this->productRepository->get($expectedOption['sku'])->getId();
                 if ($option['label'] === $expectedOption['label']) {
+                    $expectedProductId = $this->productRepository->get($expectedOption['sku'])->getId();
                     $this->assertEquals(
                         [$expectedProductId],
                         $option['products'],
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Block/Product/Renderer/Configurable/Listing/CategoryPageViewTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Block/Product/Renderer/Configurable/Listing/CategoryPageViewTest.php
@@ -41,12 +41,8 @@ protected function setUp()
     public function testCategoryPageVisualSwatchAttributeView(array $expectedConfig, array $expectedSwatchConfig): void
     {
         $this->setAttributeUsedInProductListing('visual_swatch_attribute');
-        $product = $this->productRepository->get('configurable');
-        $this->block->setProduct($product);
         $result = $this->generateBlockJsonConfigData();
-        $this->checkResultIsNotEmpty($result);
-        $this->assertConfig($result['json_config'], $expectedConfig);
-        $this->assertSwatchConfig($result['json_swatch_config'], $expectedSwatchConfig);
+        $this->processAssert($result, $expectedConfig, $expectedSwatchConfig);
     }
 
     /**
@@ -61,12 +57,8 @@ public function testCategoryPageVisualSwatchAttributeView(array $expectedConfig,
     public function testCategoryPageTextSwatchAttributeView(array $expectedConfig, array $expectedSwatchConfig): void
     {
         $this->setAttributeUsedInProductListing('text_swatch_attribute');
-        $product = $this->productRepository->get('configurable');
-        $this->block->setProduct($product);
         $result = $this->generateBlockJsonConfigData();
-        $this->checkResultIsNotEmpty($result);
-        $this->assertConfig($result['json_config'], $expectedConfig);
-        $this->assertSwatchConfig($result['json_swatch_config'], $expectedSwatchConfig);
+        $this->processAssert($result, $expectedConfig, $expectedSwatchConfig);
     }
 
     /**
@@ -82,12 +74,8 @@ public function testCategoryPageTwoAttributesView(array $expectedConfig, array $
     {
         $this->setAttributeUsedInProductListing('visual_swatch_attribute');
         $this->setAttributeUsedInProductListing('text_swatch_attribute');
-        $product = $this->productRepository->get('configurable');
-        $this->block->setProduct($product);
         $result = $this->generateBlockJsonConfigData();
-        $this->checkResultIsNotEmpty($result);
-        $this->assertConfig($result['json_config'], $expectedConfig);
-        $this->assertSwatchConfig($result['json_swatch_config'], $expectedSwatchConfig);
+        $this->processAssert($result, $expectedConfig, $expectedSwatchConfig);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Block/Product/Renderer/Configurable/ProductPageViewTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Block/Product/Renderer/Configurable/ProductPageViewTest.php
@@ -7,10 +7,9 @@
 
 namespace Magento\Swatches\Block\Product\Renderer\Configurable;
 
-use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\Serialize\SerializerInterface;
@@ -40,18 +39,21 @@ class ProductPageViewTest extends TestCase
     /** @var ProductAttributeRepositoryInterface */
     protected $productAttributeRepository;
 
-    /** @var ProductRepositoryInterface */
-    protected $productRepository;
-
     /** @var LayoutInterface */
     protected $layout;
 
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
     /** @var Registry */
     private $registry;
 
     /** @var SerializerInterface */
     private $json;
 
+    /** @var ProductResource */
+    private $productResource;
+
     /**
      * @inheritdoc
      */
@@ -66,21 +68,11 @@ protected function setUp()
         $this->registry = $this->objectManager->get(Registry::class);
         $this->json = $this->objectManager->get(SerializerInterface::class);
         $this->productAttributeRepository = $this->objectManager->create(ProductAttributeRepositoryInterface::class);
+        $this->productResource = $this->objectManager->create(ProductResource::class);
         $this->template = Configurable::SWATCH_RENDERER_TEMPLATE;
     }
 
     /**
-     * @inheritdoc
-     */
-    protected function tearDown()
-    {
-        $this->registry->unregister('product');
-
-        parent::tearDown();
-    }
-
-    /**
-     * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Swatches/_files/configurable_product_text_swatch_attribute.php
      *
      * @dataProvider expectedTextSwatchDataProvider
@@ -91,12 +83,8 @@ protected function tearDown()
      */
     public function testProductPageTextSwatchAttributeView(array $expectedConfig, array $expectedSwatchConfig): void
     {
-        $product = $this->productRepository->get('configurable');
-        $this->registerProduct($product);
         $result = $this->generateBlockJsonConfigData();
-        $this->checkResultIsNotEmpty($result);
-        $this->assertConfig($result['json_config'], $expectedConfig);
-        $this->assertSwatchConfig($result['json_swatch_config'], $expectedSwatchConfig);
+        $this->processAssert($result, $expectedConfig, $expectedSwatchConfig);
     }
 
     /**
@@ -152,12 +140,8 @@ public function expectedTextSwatchDataProvider(): array
      */
     public function testProductPageVisualSwatchAttributeView(array $expectedConfig, array $expectedSwatchConfig): void
     {
-        $product = $this->productRepository->get('configurable');
-        $this->registerProduct($product);
         $result = $this->generateBlockJsonConfigData();
-        $this->checkResultIsNotEmpty($result);
-        $this->assertConfig($result['json_config'], $expectedConfig);
-        $this->assertSwatchConfig($result['json_swatch_config'], $expectedSwatchConfig);
+        $this->processAssert($result, $expectedConfig, $expectedSwatchConfig);
     }
 
     /**
@@ -212,12 +196,8 @@ public function expectedVisualSwatchDataProvider(): array
      */
     public function testProductPageTwoAttributesView(array $expectedConfig, array $expectedSwatchConfig): void
     {
-        $product = $this->productRepository->get('configurable');
-        $this->registerProduct($product);
         $result = $this->generateBlockJsonConfigData();
-        $this->checkResultIsNotEmpty($result);
-        $this->assertConfig($result['json_config'], $expectedConfig);
-        $this->assertSwatchConfig($result['json_swatch_config'], $expectedSwatchConfig);
+        $this->processAssert($result, $expectedConfig, $expectedSwatchConfig);
     }
 
     /**
@@ -338,21 +318,38 @@ public function expectedTwoAttributesProvider(): array
      */
     protected function generateBlockJsonConfigData(): array
     {
+        $product = $this->productRepository->get('configurable');
+        $this->block->setProduct($product);
         $this->block->setTemplate($this->template);
         $jsonConfig = $this->json->unserialize($this->block->getJsonConfig())['attributes'] ?? null;
         $jsonSwatchConfig = $this->json->unserialize($this->block->getJsonSwatchConfig());
 
         return ['json_config' => $jsonConfig, 'json_swatch_config' => $jsonSwatchConfig];
     }
 
+    /**
+     * Process test asserts
+     *
+     * @param $actualConfig
+     * @param $expectedConfig
+     * @param $expectedSwatchConfig
+     * @return void
+     */
+    protected function processAssert($actualConfig, $expectedConfig, $expectedSwatchConfig): void
+    {
+        $this->checkResultIsNotEmpty($actualConfig);
+        $this->assertConfig($actualConfig['json_config'], $expectedConfig);
+        $this->assertSwatchConfig($actualConfig['json_swatch_config'], $expectedSwatchConfig);
+    }
+
     /**
      * Assert that correct data was generated
      *
      * @param array $actualData
      * @param array $expectedData
      * @return void
      */
-    protected function assertSwatchConfig(array $actualData, array $expectedData): void
+    private function assertSwatchConfig(array $actualData, array $expectedData): void
     {
         foreach ($actualData as $actualDataItem) {
             $currentType = $this->json->unserialize($actualDataItem['additional_data'])['swatch_input_type'] ?? null;
@@ -372,11 +369,11 @@ protected function assertSwatchConfig(array $actualData, array $expectedData): v
      * @param array $expectedData
      * @return void
      */
-    protected function assertConfig(array $actualData, array $expectedData): void
+    private function assertConfig(array $actualData, array $expectedData): void
     {
         foreach ($actualData as $actualDataItem) {
             $expectedItem = $expectedData[$actualDataItem['code']];
-            $this->assertEquals($expectedData[$actualDataItem['code']]['label'], $actualDataItem['label']);
+            $this->assertEquals($expectedItem['label'], $actualDataItem['label']);
             $this->checkOptions($actualDataItem, $expectedItem);
         }
     }
@@ -386,7 +383,7 @@ protected function assertConfig(array $actualData, array $expectedData): void
      *
      * @param array $result
      */
-    protected function checkResultIsNotEmpty(array $result): void
+    private function checkResultIsNotEmpty(array $result): void
     {
         foreach ($result as $item) {
             $this->assertNotNull($item);
@@ -404,28 +401,12 @@ private function getProductIdsBySkus(array $skus): array
     {
         $productIds = [];
         foreach ($skus as $sku) {
-            try {
-                $productIds[] = $this->productRepository->get($sku)->getId();
-            } catch (NoSuchEntityException $e) {
-                $this->fail(sprintf('The product with sku %s was not created', $sku));
-            }
+            $productIds[] = $this->productResource->getIdBySku($sku);
         }
 
         return $productIds;
     }
 
-    /**
-     * Register product
-     *
-     * @param ProductInterface $product
-     * @return void
-     */
-    private function registerProduct(ProductInterface $product): void
-    {
-        $this->registry->unregister('product');
-        $this->registry->register('product', $product);
-    }
-
     /**
      * Check attribute options
      *
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/configurable_product_text_swatch_attribute.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/configurable_product_text_swatch_attribute.php
@@ -5,6 +5,7 @@
  */
 declare(strict_types=1);
 
+use Magento\Catalog\Api\Data\ProductExtensionFactory;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
@@ -26,7 +27,7 @@
 $attribute = $productAttributeRepository->get('text_swatch_attribute');
 $options = $attribute->getOptions();
 /** @var WebsiteRepositoryInterface $websiteRepository */
-$websiteRepository = $objectManager->create(WebsiteRepositoryInterface::class);
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
 $baseWebsite = $websiteRepository->get('base');
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(ProductRepositoryInterface::class);
@@ -60,7 +61,7 @@
     $associatedProductIds[] = $product->getId();
 }
 /** @var Factory $optionsFactory */
-$optionsFactory = $objectManager->create(Factory::class);
+$optionsFactory = $objectManager->get(Factory::class);
 $configurableAttributesData = [
     [
         'attribute_id' => $attribute->getId(),
@@ -73,7 +74,9 @@
 $configurableOptions = $optionsFactory->create($configurableAttributesData);
 
 $product = $productFactory->create();
-$extensionConfigurableAttributes = $product->getExtensionAttributes();
+/** @var ProductExtensionFactory $extensionAttributesFactory */
+$extensionAttributesFactory = $objectManager->get(ProductExtensionFactory::class);
+$extensionConfigurableAttributes = $product->getExtensionAttributes() ?: $extensionAttributesFactory->create();
 $extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
 $extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
 $product->setExtensionAttributes($extensionConfigurableAttributes);
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/configurable_product_two_attributes.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/configurable_product_two_attributes.php
@@ -5,6 +5,7 @@
  */
 declare(strict_types=1);
 
+use Magento\Catalog\Api\Data\ProductExtensionFactory;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
@@ -30,7 +31,7 @@
 $options = $attribute->getOptions();
 $secondAttributeOptions = $secondAttribute->getOptions();
 /** @var WebsiteRepositoryInterface $websiteRepository */
-$websiteRepository = $objectManager->create(WebsiteRepositoryInterface::class);
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
 $baseWebsite = $websiteRepository->get('base');
 /** @var ProductAttributeRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(ProductRepositoryInterface::class);
@@ -82,7 +83,7 @@
 }
 
 $allAttributes = [$attribute, $secondAttribute];
-$optionsFactory = $objectManager->create(Factory::class);
+$optionsFactory = $objectManager->get(Factory::class);
 
 foreach ($allAttributes as $attribute) {
     $configurableAttributesData[] =
@@ -99,8 +100,10 @@
 }
 
 $configurableOptions = $optionsFactory->create($configurableAttributesData);
-$product = $objectManager->create(Product::class);
-$extensionConfigurableAttributes = $product->getExtensionAttributes();
+$product = $productFactory->create();
+/** @var ProductExtensionFactory $extensionAttributesFactory */
+$extensionAttributesFactory = $objectManager->get(ProductExtensionFactory::class);
+$extensionConfigurableAttributes = $product->getExtensionAttributes() ?: $extensionAttributesFactory->create();
 $extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
 $extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
 $product->setExtensionAttributes($extensionConfigurableAttributes);
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/configurable_product_visual_swatch_attribute.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/configurable_product_visual_swatch_attribute.php
@@ -5,6 +5,7 @@
  */
 declare(strict_types=1);
 
+use Magento\Catalog\Api\Data\ProductExtensionFactory;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
@@ -26,7 +27,7 @@
 $attribute = $productAttributeRepository->get('visual_swatch_attribute');
 $options = $attribute->getOptions();
 /** @var WebsiteRepositoryInterface $websiteRepository */
-$websiteRepository = $objectManager->create(WebsiteRepositoryInterface::class);
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
 $baseWebsite = $websiteRepository->get('base');
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(ProductRepositoryInterface::class);
@@ -60,7 +61,7 @@
     $associatedProductIds[] = $product->getId();
 }
 /** @var Factory $optionsFactory */
-$optionsFactory = $objectManager->create(Factory::class);
+$optionsFactory = $objectManager->get(Factory::class);
 $configurableAttributesData = [
     [
         'attribute_id' => $attribute->getId(),
@@ -73,7 +74,9 @@
 $configurableOptions = $optionsFactory->create($configurableAttributesData);
 
 $product = $productFactory->create();
-$extensionConfigurableAttributes = $product->getExtensionAttributes();
+/** @var ProductExtensionFactory $extensionAttributesFactory */
+$extensionAttributesFactory = $objectManager->get(ProductExtensionFactory::class);
+$extensionConfigurableAttributes = $product->getExtensionAttributes() ?: $extensionAttributesFactory->create();
 $extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
 $extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
 $product->setExtensionAttributes($extensionConfigurableAttributes);
