#31332:Schema changes implementation for configurable option selection - fixed webapi tests

Author: sasha19957099

app/code/Magento/ConfigurableProductGraphQl/Model/Options/SelectionUidFormatter.php

@@ -46,11 +46,7 @@ public function __construct(Uid $idEncoder)
      */
     public function encode(int $attributeId, int $indexId): string
     {
-        return $this->idEncoder->encode(implode(self::UID_SEPARATOR, [
-            self::UID_PREFIX,
-            $attributeId,
-            $indexId
-        ]));
+        return $this->idEncoder->encode(implode(self::UID_SEPARATOR, [self::UID_PREFIX, $attributeId, $indexId]));
     }
 
     /**

dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php

@@ -3,18 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\GraphQl\ConfigurableProduct;
 
 use Exception;
+use Magento\CatalogInventory\Model\Configuration;
 use Magento\Config\Model\ResourceModel\Config;
+use Magento\ConfigurableProductGraphQl\Model\Options\SelectionUidFormatter;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\CatalogInventory\Model\Configuration;
 
 /**
  * Add configurable product to cart testcases
@@ -41,6 +43,11 @@ class AddConfigurableProductToCartSingleMutationTest extends GraphQlAbstract
      */
     private $reinitConfig;
 
+    /**
+     * @var SelectionUidFormatter
+     */
+    private $selectionUidFormatter;
+
     /**
      * @inheritdoc
      */
@@ -51,13 +58,14 @@ protected function setUp(): void
         $this->resourceConfig = $objectManager->get(Config::class);
         $this->scopeConfig = $objectManager->get(ScopeConfigInterface::class);
         $this->reinitConfig = $objectManager->get(ReinitableConfigInterface::class);
+        $this->selectionUidFormatter = $objectManager->get(SelectionUidFormatter::class);
     }
 
     /**
      * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      */
-    public function testAddConfigurableProductToCart()
+    public function testAddConfigurableProductToCart(): void
     {
         $product = $this->getConfigurableProductInfo();
         $quantity = 2;
@@ -77,7 +85,8 @@ public function testAddConfigurableProductToCart()
         );
 
         $response = $this->graphQlMutation($query);
-        $expectedProductOptionsValueUid = $this->generateConfigurableSelectionUID($attributeId, $valueIndex);
+
+        $expectedProductOptionsValueUid = $this->selectionUidFormatter->encode($attributeId, $valueIndex);
         $expectedProductOptionsUid = base64_encode("configurable/$productRowId/$attributeId");
         $cartItem = current($response['addProductsToCart']['cart']['items']);
         self::assertEquals($quantity, $cartItem['quantity']);
@@ -94,35 +103,11 @@ public function testAddConfigurableProductToCart()
         self::assertArrayHasKey('value_label', $option);
     }
 
-    /**
-     * Generates UID configurable product
-     *
-     * @param int $attributeId
-     * @param int $valueIndex
-     * @return string
-     */
-    private function generateConfigurableSelectionUID(int $attributeId, int $valueIndex): string
-    {
-        return base64_encode("configurable/$attributeId/$valueIndex");
-    }
-
-    /**
-     * Generates UID for super configurable product super attributes
-     *
-     * @param int $attributeId
-     * @param int $valueIndex
-     * @return string
-     */
-    private function generateSuperAttributesUIDQuery(int $attributeId, int $valueIndex): string
-    {
-        return 'selected_options: ["' . $this->generateConfigurableSelectionUID($attributeId, $valueIndex) . '"]';
-    }
-
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/configurable_products_with_custom_attribute_layered_navigation.php
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      */
-    public function testAddConfigurableProductWithWrongSuperAttributes()
+    public function testAddConfigurableProductWithWrongSuperAttributes(): void
     {
         $product = $this->getConfigurableProductInfo();
         $quantity = 2;
@@ -150,7 +135,7 @@ public function testAddConfigurableProductWithWrongSuperAttributes()
      * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_sku.php
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      */
-    public function testAddProductIfQuantityIsNotAvailable()
+    public function testAddProductIfQuantityIsNotAvailable(): void
     {
         $product = $this->getConfigurableProductInfo();
         $parentSku = $product['sku'];
@@ -179,7 +164,7 @@ public function testAddProductIfQuantityIsNotAvailable()
      * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_sku.php
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      */
-    public function testAddNonExistentConfigurableProductParentToCart()
+    public function testAddNonExistentConfigurableProductParentToCart(): void
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
         $parentSku = 'configurable_no_exist';
@@ -203,7 +188,7 @@ public function testAddNonExistentConfigurableProductParentToCart()
      * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_zero_qty_first_child.php
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      */
-    public function testOutOfStockVariationToCart()
+    public function testOutOfStockVariationToCart(): void
     {
         $showOutOfStock = $this->scopeConfig->getValue(Configuration::XML_PATH_SHOW_OUT_OF_STOCK);
 
@@ -215,7 +200,7 @@ public function testOutOfStockVariationToCart()
         $attributeId = (int) $product['configurable_options'][0]['attribute_id'];
         $valueIndex = $product['configurable_options'][0]['values'][0]['value_index'];
         // Asserting that the first value is the right option we want to add to cart
-        $this->assertEquals(
+        self::assertEquals(
             $product['configurable_options'][0]['values'][0]['label'],
             'Option 1'
         );
@@ -237,7 +222,7 @@ public function testOutOfStockVariationToCart()
             'There are no source items with the in stock status',
             'This product is out of stock.'
         ];
-        $this->assertContains(
+        self::assertContains(
             $response['addProductsToCart']['user_errors'][0]['message'],
             $expectedErrorMessages
         );
@@ -312,6 +297,18 @@ private function getConfigurableProductInfo(): array
         return current($searchResponse['products']['items']);
     }
 
+    /**
+     * Generates UID for super configurable product super attributes
+     *
+     * @param int $attributeId
+     * @param int $valueIndex
+     * @return string
+     */
+    private function generateSuperAttributesUIDQuery(int $attributeId, int $valueIndex): string
+    {
+        return 'selected_options: ["' . $this->selectionUidFormatter->encode($attributeId, $valueIndex) . '"]';
+    }
+
     /**
      * Returns GraphQl query for fetching configurable product information
      *
@@ -349,15 +346,28 @@ private function getFetchProductQuery(string $term): string
             value_index
           }
         }
-        configurable_options_selection_metadata {
-          options_available_for_selection {
+        configurable_product_options_selection {
+          configurable_options {
+            uid
             attribute_code
-            option_value_uids
+            label
+            values {
+              uid
+              is_available
+              is_use_default
+              label
+            }
           }
           variant {
             uid
-            name
-            attribute_set_id
+            sku
+            url_key
+            url_path
+          }
+          media_gallery {
+            url
+            label
+            disabled
           }
         }
       }