Skip to content
This repository has been archived by the owner on Dec 19, 2019. It is now read-only.

graphQl-890: Replaced usage of the CartItemQuantity with the CartItem… #899

Merged
merged 11 commits into from
Oct 31, 2019
Merged

graphQl-890: Replaced usage of the CartItemQuantity with the CartItem… #899

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b3f510d
graphQl-890: Replaced usage of the CartItemQuantity with the CartItem…
Sep 4, 2019
f7ab08e
graphQl-890: fixed static tests
Sep 4, 2019
94e8f14
Merge branches '2.3-develop' and 'GraphQl-890-Replaced-usage-of-CartI…
Sep 12, 2019
77e3a9c
Merge branches '2.3-develop' and 'GraphQl-890-Replaced-usage-of-CartI…
Sep 27, 2019
863d178
graphQl-890: fixed deprecation messages
Sep 27, 2019
6297199
GraphQl-890: added shipping addresses to tests
Oct 20, 2019
795931f
magento/graphql-ce#890: [Checkout] Replace usage of CartItemQuantity …
lenaorobei Oct 23, 2019
c9c13a6
Merge branch '2.3-develop' of github.com:magento/graphql-ce into Grap…
lenaorobei Oct 23, 2019
8b51315
magento/graphql-ce#890: [Checkout] Replace usage of CartItemQuantity …
lenaorobei Oct 23, 2019
344648f
magento/graphql-ce#890: [Checkout] Replace usage of CartItemQuantity …
lenaorobei Oct 23, 2019
b9f708b
magento/graphql-ce#890: [Checkout] Replace usage of CartItemQuantity …
lenaorobei Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/code/Magento/QuoteGraphQl/etc/schema.graphqls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,16 @@ interface CartAddressInterface @typeResolver(class: "\\Magento\\QuoteGraphQl\\Mo
type ShippingCartAddress implements CartAddressInterface {
available_shipping_methods: [AvailableShippingMethod] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddress\\AvailableShippingMethods")
selected_shipping_method: SelectedShippingMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddress\\SelectedShippingMethod")
items_weight: Float
cart_items: [CartItemQuantity]
customer_notes: String
items_weight: Float @deprecated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add reason here.

cart_items: [CartItemInterface]
}

type BillingCartAddress implements CartAddressInterface {
customer_notes: String @deprecated (reason: "The field is used only in shipping address")
}

type CartItemQuantity {
type CartItemQuantity @deprecated(reason: "Use CartItemInterface instead") {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the ticket:

All fields in CartItemQuantity should be deprecated (so this type can be completely removed in the future releases)

cart_item_id: Int!
quantity: Float!
}
Expand Down
40 changes: 40 additions & 0 deletions ...ts/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,32 @@ public function testAddSimpleProductToCart()
self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
self::assertEquals($quantity, $response['addSimpleProductsToCart']['cart']['items'][0]['quantity']);
self::assertEquals($sku, $response['addSimpleProductsToCart']['cart']['items'][0]['product']['sku']);
self::assertArrayHasKey('prices', $response['addSimpleProductsToCart']['cart']['items'][0]);

self::assertArrayHasKey('price', $response['addSimpleProductsToCart']['cart']['items'][0]['prices']);
$price = $response['addSimpleProductsToCart']['cart']['items'][0]['prices']['price'];
self::assertArrayHasKey('value', $price);
self::assertEquals(10, $price['value']);
self::assertArrayHasKey('currency', $price);
self::assertEquals('USD', $price['currency']);

self::assertArrayHasKey('row_total', $response['addSimpleProductsToCart']['cart']['items'][0]['prices']);
$rowTotal = $response['addSimpleProductsToCart']['cart']['items'][0]['prices']['row_total'];
self::assertArrayHasKey('value', $rowTotal);
self::assertEquals(20, $rowTotal['value']);
self::assertArrayHasKey('currency', $rowTotal);
self::assertEquals('USD', $rowTotal['currency']);

self::assertArrayHasKey(
'row_total_including_tax',
$response['addSimpleProductsToCart']['cart']['items'][0]['prices']
);
$rowTotalIncludingTax =
$response['addSimpleProductsToCart']['cart']['items'][0]['prices']['row_total_including_tax'];
self::assertArrayHasKey('value', $rowTotalIncludingTax);
self::assertEquals(20, $rowTotalIncludingTax['value']);
self::assertArrayHasKey('currency', $rowTotalIncludingTax);
self::assertEquals('USD', $rowTotalIncludingTax['currency']);
}

/**
Expand Down Expand Up @@ -262,6 +288,20 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity):
product {
sku
}
prices {
price {
value
currency
}
row_total {
value
currency
}
row_total_including_tax {
value
currency
}
}
}
}
}
Expand Down
40 changes: 40 additions & 0 deletions ...tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,32 @@ public function testAddSimpleProductToCart()

self::assertEquals($quantity, $response['addSimpleProductsToCart']['cart']['items'][0]['quantity']);
self::assertEquals($sku, $response['addSimpleProductsToCart']['cart']['items'][0]['product']['sku']);
self::assertArrayHasKey('prices', $response['addSimpleProductsToCart']['cart']['items'][0]);

self::assertArrayHasKey('price', $response['addSimpleProductsToCart']['cart']['items'][0]['prices']);
$price = $response['addSimpleProductsToCart']['cart']['items'][0]['prices']['price'];
self::assertArrayHasKey('value', $price);
self::assertEquals(10, $price['value']);
self::assertArrayHasKey('currency', $price);
self::assertEquals('USD', $price['currency']);

self::assertArrayHasKey('row_total', $response['addSimpleProductsToCart']['cart']['items'][0]['prices']);
$rowTotal = $response['addSimpleProductsToCart']['cart']['items'][0]['prices']['row_total'];
self::assertArrayHasKey('value', $rowTotal);
self::assertEquals(20, $rowTotal['value']);
self::assertArrayHasKey('currency', $rowTotal);
self::assertEquals('USD', $rowTotal['currency']);

self::assertArrayHasKey(
'row_total_including_tax',
$response['addSimpleProductsToCart']['cart']['items'][0]['prices']
);
$rowTotalIncludingTax =
$response['addSimpleProductsToCart']['cart']['items'][0]['prices']['row_total_including_tax'];
self::assertArrayHasKey('value', $rowTotalIncludingTax);
self::assertEquals(20, $rowTotalIncludingTax['value']);
self::assertArrayHasKey('currency', $rowTotalIncludingTax);
self::assertEquals('USD', $rowTotalIncludingTax['currency']);
}

/**
Expand Down Expand Up @@ -231,6 +257,20 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity):
product {
sku
}
prices {
price {
value
currency
}
row_total {
value
currency
}
row_total_including_tax {
value
currency
}
}
}
}
}
Expand Down