static test fixes

Prabhu Ram · Prabhu Ram · commit f91b685597c0 · 2020-08-03T23:46:51.000-05:00
diff --git a/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php b/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php
@@ -35,8 +35,10 @@ public function execute(CartItem $cartItem): array
             }
             $this->validateInput($optionData);
 
-            [, $optionId, $optionValue] = $optionData;
-            $customizableOptionsData[$optionId][] = $optionValue;
+            [$optionType, $optionId, $optionValue] = $optionData;
+            if ($optionType == self::OPTION_TYPE) {
+                $customizableOptionsData[$optionId][] = $optionValue;
+            }
         }
 
         foreach ($cartItem->getEnteredOptions() as $option) {
@@ -47,8 +49,10 @@ public function execute(CartItem $cartItem): array
                 continue;
             }
 
-            [, $optionId] = $optionData;
-            $customizableOptionsData[$optionId][] = $option->getValue();
+            [$optionType, $optionId] = $optionData;
+            if ($optionType == self::OPTION_TYPE) {
+                $customizableOptionsData[$optionId][] = $option->getValue();
+            }
         }
 
         return ['options' => $this->flattenOptionValues($customizableOptionsData)];
diff --git a/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php b/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
@@ -36,9 +36,11 @@ public function execute(CartItem $cartItem): array
             }
             $this->validateInput($optionData);
 
-            [, $optionId, $optionValueId, $optionQuantity] = $optionData;
-            $bundleOptionsData['bundle_option'][$optionId] = $optionValueId;
-            $bundleOptionsData['bundle_option_qty'][$optionId] = $optionQuantity;
+            [$optionType, $optionId, $optionValueId, $optionQuantity] = $optionData;
+            if ($optionType == self::OPTION_TYPE) {
+                $bundleOptionsData['bundle_option'][$optionId] = $optionValueId;
+                $bundleOptionsData['bundle_option_qty'][$optionId] = $optionQuantity;
+            }
         }
         //for bundle options with custom quantity
         foreach ($cartItem->getEnteredOptions() as $option) {
@@ -50,10 +52,12 @@ public function execute(CartItem $cartItem): array
             }
             $this->validateInput($optionData);
 
-            [, $optionId, $optionValueId] = $optionData;
-            $optionQuantity = $option->getValue();
-            $bundleOptionsData['bundle_option'][$optionId] = $optionValueId;
-            $bundleOptionsData['bundle_option_qty'][$optionId] = $optionQuantity;
+            [$optionType, $optionId, $optionValueId] = $optionData;
+            if ($optionType == self::OPTION_TYPE) {
+                $optionQuantity = $option->getValue();
+                $bundleOptionsData['bundle_option'][$optionId] = $optionValueId;
+                $bundleOptionsData['bundle_option_qty'][$optionId] = $optionQuantity;
+            }
         }
 
         return $bundleOptionsData;
diff --git a/app/code/Magento/QuoteConfigurableOptions/Model/Cart/BuyRequest/SuperAttributeDataProvider.php b/app/code/Magento/QuoteConfigurableOptions/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
@@ -35,8 +35,10 @@ public function execute(CartItem $cartItem): array
             }
             $this->validateInput($optionData);
 
-            [, $attributeId, $valueIndex] = $optionData;
-            $configurableProductData[$attributeId] = $valueIndex;
+            [$optionType, $attributeId, $valueIndex] = $optionData;
+            if ($optionType == self::OPTION_TYPE) {
+                $configurableProductData[$attributeId] = $valueIndex;
+            }
         }
 
         return ['super_attribute' => $configurableProductData];
diff --git a/app/code/Magento/QuoteDownloadableLinks/Model/Cart/BuyRequest/DownloadableLinkDataProvider.php b/app/code/Magento/QuoteDownloadableLinks/Model/Cart/BuyRequest/DownloadableLinkDataProvider.php
@@ -36,8 +36,10 @@ public function execute(CartItem $cartItem): array
             }
             $this->validateInput($optionData);
 
-            [, $linkId] = $optionData;
-            $linksData[] = $linkId;
+            [$optionType, $linkId] = $optionData;
+            if ($optionType == self::OPTION_TYPE) {
+                $linksData[] = $linkId;
+            }
         }
 
         return ['links' => $linksData];
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php
@@ -111,7 +111,6 @@ private function getProductOptionsViaQuery(string $sku): array
                     'value' => $value
                 ];
 
-
             } elseif (isset($option['selected_option'])) {
                 $receivedItemOptions['selected_options'][] = reset($option['selected_option'])['uid'];
                 $expectedItemOptions[$option['option_id']] = reset($option['selected_option'])['option_type_id'];
@@ -132,10 +131,9 @@ private function getProductOptionsViaQuery(string $sku): array
      */
     private function getProductQuery(string $sku): string
     {
-        $sku = $options = $values = null; // WTF?
         return <<<QUERY
 query {
-  products(filter: { sku: { eq: "$sku" } }) {
+  products(search: "$sku") {
     items {
       sku
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
@@ -256,14 +256,4 @@ private function getAddToCartMutation(
 }
 MUTATION;
     }
-
-    private function getCartQuery(string $maskedQuoteId)
-    {
-        return <<<QUERY
-{
-    cart(cart_id: "{$maskedQuoteId}") {
-        total_quantity
-}
-QUERY;
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartItemOptionsFromUID.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartItemOptionsFromUID.php
@@ -23,22 +23,25 @@ public function execute(array $encodedCustomOptions): array
         $customOptions = [];
 
         foreach ($encodedCustomOptions['selected_options'] as $selectedOption) {
-            [,$optionId, $optionValueId] = explode('/', base64_decode($selectedOption));
-            if (isset($customOptions[$optionId])) {
-                $customOptions[$optionId] = [$customOptions[$optionId], $optionValueId];
-            } else {
-                $customOptions[$optionId] = $optionValueId;
+            [$optionType, $optionId, $optionValueId] = explode('/', base64_decode($selectedOption));
+            if ($optionType == 'custom-option') {
+                if (isset($customOptions[$optionId])) {
+                    $customOptions[$optionId] = [$customOptions[$optionId], $optionValueId];
+                } else {
+                    $customOptions[$optionId] = $optionValueId;
+                }
             }
-
         }
 
         foreach ($encodedCustomOptions['entered_options'] as $enteredOption) {
             /* The date normalization is required since the attribute might value is formatted by the system */
             if ($enteredOption['type'] === 'date') {
                 $enteredOption['value'] = date('M d, Y', strtotime($enteredOption['value']));
             }
-            [,$optionId] = explode('/', base64_decode($enteredOption['id']));
-            $customOptions[$optionId] = $enteredOption['value'];
+            [$optionType, $optionId] = explode('/', base64_decode($enteredOption['id']));
+            if ($optionType = 'custom-option') {
+                $customOptions[$optionId] = $enteredOption['value'];
+            }
         }
 
         return $customOptions;

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,10 @@ public function execute(CartItem $cartItem): array`
`35`	`35`	`}`
`36`	`36`	`$this->validateInput($optionData);`
`37`	`37`
`38`		`- [, $optionId, $optionValue] = $optionData;`
`39`		`- $customizableOptionsData[$optionId][] = $optionValue;`
	`38`	`+ [$optionType, $optionId, $optionValue] = $optionData;`
	`39`	`+ if ($optionType == self::OPTION_TYPE) {`
	`40`	`+ $customizableOptionsData[$optionId][] = $optionValue;`
	`41`	`+ }`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`foreach ($cartItem->getEnteredOptions() as $option) {`
`@@ -47,8 +49,10 @@ public function execute(CartItem $cartItem): array`
`47`	`49`	`continue;`
`48`	`50`	`}`
`49`	`51`
`50`		`- [, $optionId] = $optionData;`
`51`		`- $customizableOptionsData[$optionId][] = $option->getValue();`
	`52`	`+ [$optionType, $optionId] = $optionData;`
	`53`	`+ if ($optionType == self::OPTION_TYPE) {`
	`54`	`+ $customizableOptionsData[$optionId][] = $option->getValue();`
	`55`	`+ }`
`52`	`56`	`}`
`53`	`57`
`54`	`58`	`return ['options' => $this->flattenOptionValues($customizableOptionsData)];`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,10 @@ public function execute(CartItem $cartItem): array`
`36`	`36`	`}`
`37`	`37`	`$this->validateInput($optionData);`
`38`	`38`
`39`		`- [, $linkId] = $optionData;`
`40`		`- $linksData[] = $linkId;`
	`39`	`+ [$optionType, $linkId] = $optionData;`
	`40`	`+ if ($optionType == self::OPTION_TYPE) {`
	`41`	`+ $linksData[] = $linkId;`
	`42`	`+ }`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`return ['links' => $linksData];`
Original file line number	Diff line number	Diff line change
`@@ -256,14 +256,4 @@ private function getAddToCartMutation(`
`256`	`256`	`}`
`257`	`257`	`MUTATION;`
`258`	`258`	`}`
`259`		`-`
`260`		`- private function getCartQuery(string $maskedQuoteId)`
`261`		`- {`
`262`		`- return <<<QUERY`
`263`		`-{`
`264`		`- cart(cart_id: "{$maskedQuoteId}") {`
`265`		`- total_quantity`
`266`		`-}`
`267`		`-QUERY;`
`268`		`- }`
`269`	`259`	`}`