#631 Rename qty by quantity Rename CartItemQuantityInput by CartItemU…

…pdateQuantityInput Rename CartItemInput by CartItemQuantityInput Adapt tests
magento · May 1, 2019 · b35ec00 · b35ec00
1 parent 05e7ec2
commit b35ec00
Show file tree

Hide file tree

Showing 22 changed files with 58 additions and 58 deletions.
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -49,7 +49,7 @@ type AddConfigurableProductsToCartOutput {
 }
 
 input ConfigurableProductCartItemInput {
-    data: CartItemInput!
+    data: CartItemQuantityInput!
     variant_sku: String!
     customizable_options:[CustomizableOptionInput!]
 }

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
@@ -121,9 +121,9 @@ private function extractSku(array $cartItemData): string
      */
     private function extractQty(array $cartItemData): float
     {
-        $qty = $this->arrayManager->get('data/qty', $cartItemData);
+        $qty = $this->arrayManager->get('data/quantity', $cartItemData);
         if (!isset($qty)) {
-            throw new GraphQlInputException(__('Missing key "qty" in cart item data'));
+            throw new GraphQlInputException(__('Missing key "quantity" in cart item data'));
         }
         return (float)$qty;
     }

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItems.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItems.php
@@ -38,7 +38,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
             $itemsData[] = [
                 'id' => $cartItem->getItemId(),
-                'qty' => $cartItem->getQty(),
+                'quantity' => $cartItem->getQty(),
                 'product' => $productData,
                 'model' => $cartItem,
             ];

diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -31,7 +31,7 @@ input AddSimpleProductsToCartInput {
 }
 
 input SimpleProductCartItemInput {
-    data: CartItemInput!
+    data: CartItemQuantityInput!
     customizable_options:[CustomizableOptionInput!]
 }
 
@@ -41,13 +41,13 @@ input AddVirtualProductsToCartInput {
 }
 
 input VirtualProductCartItemInput {
-    data: CartItemInput!
+    data: CartItemQuantityInput!
     customizable_options:[CustomizableOptionInput!]
 }
 
-input CartItemInput {
+input CartItemQuantityInput {
     sku: String!
-    qty: Float!
+    quantity: Float!
 }
 
 input CustomizableOptionInput {
@@ -62,10 +62,10 @@ input ApplyCouponToCartInput {
 
 input UpdateCartItemsInput {
     cart_id: String!
-    cart_items: [CartItemQuantityInput!]!
+    cart_items: [CartItemUpdateQuantityInput!]!
 }
 
-input CartItemQuantityInput {
+input CartItemUpdateQuantityInput {
     cart_item_id: Int!
     quantity: Float!
 }
@@ -304,7 +304,7 @@ type VirtualCartItem implements CartItemInterface @doc(description: "Virtual Car
 
 interface CartItemInterface @typeResolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CartItemTypeResolver") {
     id: String!
-    qty: Float!
+    quantity: Float!
     product: ProductInterface!
 }
 

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php
@@ -115,7 +115,7 @@ private function getQuery(string $maskedQuoteId, string $sku, float $qty) : stri
       cartItems: [
         {
           data: {
-            qty: $qty
+            quantity: $qty
             sku: "$sku"
           }
         }
@@ -124,7 +124,7 @@ private function getQuery(string $maskedQuoteId, string $sku, float $qty) : stri
   ) {
     cart {
       items {
-        qty
+        quantity
       }
     }
   }

diff --git a/...tional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php b/...tional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
@@ -44,7 +44,7 @@ public function testAddConfigurableProductToCart()
         $response = $this->graphQlMutation($query);
 
         $cartItems = $response['addConfigurableProductsToCart']['cart']['items'];
-        self::assertEquals($qty, $cartItems[0]['qty']);
+        self::assertEquals($qty, $cartItems[0]['quantity']);
         self::assertEquals($variantSku, $cartItems[0]['product']['sku']);
     }
 
@@ -97,7 +97,7 @@ private function getQuery(string $maskedQuoteId, string $variantSku, int $qty):
         {
           variant_sku: "{$variantSku}"
           data: {
-            qty: {$qty}
+            quantity: {$qty}
             sku: "{$variantSku}"
           }
         }
@@ -107,7 +107,7 @@ private function getQuery(string $maskedQuoteId, string $variantSku, int $qty):
     cart {
       items {
         id
-        qty
+        quantity
         product {
           name
           sku

diff --git a/...unctional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php b/...unctional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php
@@ -62,7 +62,7 @@ public function testAddSimpleProductWithOptions()
       cartItems: [
         {
           data: {
-            qty: $qty
+            quantity: $qty
             sku: "$sku"
           },
           customizable_options: $queryCustomizableOptions  
@@ -121,7 +121,7 @@ public function testAddSimpleProductWithNoRequiredOptionsSet()
       cartItems: [
         {
           data: {
-            qty: $qty
+            quantity: $qty
             sku: "$sku"
           }
         }

diff --git a/...nctional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php b/...nctional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php
@@ -62,7 +62,7 @@ public function testAddVirtualProductWithOptions()
       cartItems: [
         {
           data: {
-            qty: $qty
+            quantity: $qty
             sku: "$sku"
           },
           customizable_options: $queryCustomizableOptions  
@@ -121,7 +121,7 @@ public function testAddVirtualProductWithNoRequiredOptionsSet()
       cartItems: [
         {
           data: {
-            qty: $qty
+            quantity: $qty
             sku: "$sku"
           }
         }

diff --git a/...ts/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php b/...ts/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php
@@ -49,7 +49,7 @@ public function testAddSimpleProductToCart()
         $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
-        self::assertEquals($qty, $response['addSimpleProductsToCart']['cart']['items'][0]['qty']);
+        self::assertEquals($qty, $response['addSimpleProductsToCart']['cart']['items'][0]['quantity']);
         self::assertEquals($sku, $response['addSimpleProductsToCart']['cart']['items'][0]['product']['sku']);
     }
 
@@ -142,7 +142,7 @@ private function getQuery(string $maskedQuoteId, string $sku, int $qty): string
     cartItems: [
       {
         data: {
-          qty: {$qty}
+          quantity: {$qty}
           sku: "{$sku}"
         }
       }                
@@ -151,7 +151,7 @@ private function getQuery(string $maskedQuoteId, string $sku, int $qty): string
     cart {
       items {
         id
-        qty
+        quantity
         product {
           sku
         }

diff --git a/...s/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php b/...s/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php
@@ -49,7 +49,7 @@ public function testAddVirtualProductToCart()
         $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response['addVirtualProductsToCart']);
-        self::assertEquals($qty, $response['addVirtualProductsToCart']['cart']['items'][0]['qty']);
+        self::assertEquals($qty, $response['addVirtualProductsToCart']['cart']['items'][0]['quantity']);
         self::assertEquals($sku, $response['addVirtualProductsToCart']['cart']['items'][0]['product']['sku']);
     }
 
@@ -142,7 +142,7 @@ private function getQuery(string $maskedQuoteId, string $sku, int $qty): string
     cartItems: [
       {
         data: {
-          qty: {$qty}
+          quantity: {$qty}
           sku: "{$sku}"
         }
       }                
@@ -151,7 +151,7 @@ private function getQuery(string $maskedQuoteId, string $sku, int $qty): string
     cart {
       items {
         id
-        qty
+        quantity
         product {
           sku
         }

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php
@@ -215,7 +215,7 @@ private function addProductToCart(string $cartId, float $qty, string $sku): void
       cartItems: [
         {
           data: {
-            qty: {$qty}
+            quantity: {$qty}
             sku: "{$sku}"
           }
         }
@@ -224,7 +224,7 @@ private function addProductToCart(string $cartId, float $qty, string $sku): void
   ) {
     cart {
       items {
-        qty
+        quantity
         product {
           sku
         }

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -54,11 +54,11 @@ public function testGetCart()
         self::assertCount(2, $response['cart']['items']);
 
         self::assertNotEmpty($response['cart']['items'][0]['id']);
-        self::assertEquals(2, $response['cart']['items'][0]['qty']);
+        self::assertEquals(2, $response['cart']['items'][0]['quantity']);
         self::assertEquals('simple_product', $response['cart']['items'][0]['product']['sku']);
 
         self::assertNotEmpty($response['cart']['items'][1]['id']);
-        self::assertEquals(2, $response['cart']['items'][1]['qty']);
+        self::assertEquals(2, $response['cart']['items'][1]['quantity']);
         self::assertEquals('virtual-product', $response['cart']['items'][1]['product']['sku']);
     }
 
@@ -187,7 +187,7 @@ private function getQuery(string $maskedQuoteId): string
   cart(cart_id: "{$maskedQuoteId}") {
     items {
       id
-      qty
+      quantity
       product {
         sku
       }

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
@@ -107,7 +107,7 @@ public function testUpdateWithMissedItemRequiredParameters(string $input, string
   ) {
     cart {
       items {
-        qty
+        quantity
       }
     }
   }
@@ -216,7 +216,7 @@ private function getQuery(string $maskedQuoteId, int $itemId): string
   ) {
     cart {
       items {
-        qty
+        quantity
       }
     }
   }

diff --git a/...ts/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/...ts/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -196,7 +196,7 @@ public function testSetPaymentMethodWithoutRequiredParameters(string $input, str
   ) {
     cart {
       items {
-        qty
+        quantity
       }
     }
   }

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php
@@ -76,7 +76,7 @@ public function testUpdateCartItemQty()
         $item = current($responseCart['items']);
 
         $this->assertEquals($itemId, $item['id']);
-        $this->assertEquals($qty, $item['qty']);
+        $this->assertEquals($qty, $item['quantity']);
     }
 
     /**
@@ -229,7 +229,7 @@ public function testUpdateWithMissedCartItemId()
     cart {
       items {
         id
-        qty
+        quantity
       }
     }
   }
@@ -259,7 +259,7 @@ public function testUpdateWithMissedItemRequiredParameters(string $input, string
     cart {
       items {
         id
-        qty
+        quantity
       }
     }
   }
@@ -285,7 +285,7 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
             ],
             'missed_cart_item_qty' => [
                 'cart_items: [{ cart_item_id: 1 }]',
-                'Required parameter "quantity" for "cart_items" is missing.'
+                'Field CartItemUpdateQuantityInput.quantity of required type Float! was not provided.'
             ],
         ];
     }
@@ -312,7 +312,7 @@ private function getQuery(string $maskedQuoteId, int $itemId, float $qty): strin
     cart {
       items {
         id
-        qty
+        quantity
       }
     }
   }

diff --git a/...tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php b/...tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
@@ -44,7 +44,7 @@ public function testAddSimpleProductToCart()
         $response = $this->graphQlMutation($query);
         self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
 
-        self::assertEquals($qty, $response['addSimpleProductsToCart']['cart']['items'][0]['qty']);
+        self::assertEquals($qty, $response['addSimpleProductsToCart']['cart']['items'][0]['quantity']);
         self::assertEquals($sku, $response['addSimpleProductsToCart']['cart']['items'][0]['product']['sku']);
     }
 
@@ -115,7 +115,7 @@ private function getQuery(string $maskedQuoteId, string $sku, int $qty): string
       cartItems: [
         {
           data: {
-            qty: $qty
+            quantity: $qty
             sku: "$sku"
           }
         }
@@ -124,7 +124,7 @@ private function getQuery(string $maskedQuoteId, string $sku, int $qty): string
   ) {
     cart {
       items {
-        qty
+        quantity
         product {
           sku
         }

diff --git a/...ests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddVirtualProductToCartTest.php b/...ests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddVirtualProductToCartTest.php
@@ -44,7 +44,7 @@ public function testAddVirtualProductToCart()
         $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('cart', $response['addVirtualProductsToCart']);
-        self::assertEquals($qty, $response['addVirtualProductsToCart']['cart']['items'][0]['qty']);
+        self::assertEquals($qty, $response['addVirtualProductsToCart']['cart']['items'][0]['quantity']);
         self::assertEquals($sku, $response['addVirtualProductsToCart']['cart']['items'][0]['product']['sku']);
     }
 
@@ -116,7 +116,7 @@ private function getQuery(string $maskedQuoteId, string $sku, int $qty): string
       cartItems: [
         {
           data: {
-            qty: {$qty}
+            quantity: {$qty}
             sku: "{$sku}"
           }
         }
@@ -125,7 +125,7 @@ private function getQuery(string $maskedQuoteId, string $sku, int $qty): string
   ) {
     cart {
       items {
-        qty
+        quantity
         product {
           sku
         }

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CheckoutEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CheckoutEndToEndTest.php
@@ -175,7 +175,7 @@ private function addProductToCart(string $cartId, float $qty, string $sku): void
       cartItems: [
         {
           data: {
-            qty: {$qty}
+            quantity: {$qty}
             sku: "{$sku}"
           }
         }
@@ -184,7 +184,7 @@ private function addProductToCart(string $cartId, float $qty, string $sku): void
   ) {
     cart {
       items {
-        qty
+        quantity
         product {
           sku
         }