From 8fafd29c40bff83a629970e79b052de29807a40a Mon Sep 17 00:00:00 2001 From: Ievgenii Gryshkun Date: Wed, 13 Feb 2019 14:42:45 +0200 Subject: [PATCH 1/7] Fix message when maxSaleQty is set and qty is more than maxSaleQty --- .../QuoteGraphQl/Model/Cart/AddProductsToCart.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php index 005cf3a10ca8..585323a01a91 100644 --- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php +++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php @@ -46,18 +46,17 @@ public function __construct( * @param array $cartItems * @throws GraphQlInputException * @throws \Magento\Framework\Exception\LocalizedException - * @throws \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException */ public function execute(Quote $cart, array $cartItems): void { foreach ($cartItems as $cartItemData) { - $this->addProductToCart->execute($cart, $cartItemData); - } - - if ($cart->getData('has_error')) { - throw new GraphQlInputException( - __('Shopping cart error: %message', ['message' => $this->getCartErrors($cart)]) - ); + try { + $this->addProductToCart->execute($cart, $cartItemData); + } catch (\Exception $error) { + throw new GraphQlInputException( + __('Shopping cart error: %message', ['message' => $error->getMessage()]) + ); + } } $this->cartRepository->save($cart); From 3d228f3cdc4be0ae233e0db57d4b1cbe1d840f6a Mon Sep 17 00:00:00 2001 From: Ievgenii Gryshkun Date: Fri, 15 Feb 2019 09:17:38 +0200 Subject: [PATCH 2/7] Fix message when maxSaleQty is set and qty is more than maxSaleQty --- .../Model/Cart/AddProductsToCart.php | 8 +-- .../Quote/AddSimpleProductToCartTest.php | 63 +++++++++++++++++-- .../Magento/Catalog/_files/products.php | 13 ++++ 3 files changed, 73 insertions(+), 11 deletions(-) diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php index 585323a01a91..6deb387476d5 100644 --- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php +++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php @@ -50,13 +50,7 @@ public function __construct( public function execute(Quote $cart, array $cartItems): void { foreach ($cartItems as $cartItemData) { - try { - $this->addProductToCart->execute($cart, $cartItemData); - } catch (\Exception $error) { - throw new GraphQlInputException( - __('Shopping cart error: %message', ['message' => $error->getMessage()]) - ); - } + $this->addProductToCart->execute($cart, $cartItemData); } $this->cartRepository->save($cart); diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php index 4cbc614e1b8d..28bf755911ce 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php @@ -41,6 +41,23 @@ protected function setUp() $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class); } + /** + * @magentoApiDataFixture Magento/Catalog/_files/products.php + * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php + */ + public function testAddSimpleProductsToCart() + { + $sku = 'simple'; + $qty = 2; + $maskedQuoteId = $this->getMaskedQuoteId(); + $query = $this->getQueryAddSimpleProduct($maskedQuoteId, $sku, $qty); + $response = $this->graphQlQuery($query); + self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']); + $cartQty = $response['addSimpleProductsToCart']['cart']['items'][0]['qty']; + + $this->assertEquals($qty, $cartQty); + } + /** * @magentoApiDataFixture Magento/Catalog/_files/products.php * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php @@ -52,14 +69,51 @@ public function testAddProductIfQuantityIsNotAvailable() $sku = 'simple'; $qty = 200; + $maskedQuoteId = $this->getMaskedQuoteId(); + $query = $this->getQueryAddSimpleProduct($maskedQuoteId, $sku, $qty); + $this->graphQlQuery($query); + } + + /** + * @magentoApiDataFixture Magento/Catalog/_files/products.php + * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php + * @expectedException \Exception + * @expectedExceptionMessage The most you may purchase is 10000. + */ + public function testAddMoreProductsThatAllowed() + { + $sku = 'simple-product-with-huge-amount'; + $qty = 20000; + $maskedQuoteId = $this->getMaskedQuoteId(); + $query = $this->getQueryAddSimpleProduct($maskedQuoteId, $sku, $qty); + $this->graphQlQuery($query); + } + + /** + * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php + * @return string + * @throws \Magento\Framework\Exception\NoSuchEntityException + */ + public function getMaskedQuoteId() + { $this->quoteResource->load( $this->quote, 'test_order_1', 'reserved_order_id' ); - $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId()); + return $this->quoteIdToMaskedId->execute((int)$this->quote->getId()); + } - $query = <<graphQlQuery($query); } } diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products.php index 348701a99f28..407cc31e0c39 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products.php @@ -36,3 +36,16 @@ ->setStockData(['use_config_manage_stock' => 1, 'qty' => 24, 'is_in_stock' => 1]) ->setQty(24) ->save(); + +$productWithHugeQty = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() + ->create(\Magento\Catalog\Model\Product::class, ['data' => $product->getData()]); + +$productWithHugeQty->setUrlKey('simple-product-with-huge-amount') + ->setId(2) + ->setRowId(2) + ->setName('Simple Product With Huge Amount') + ->setSku('simple-product-with-huge-amount') + ->setCustomDesign('Magento/blank') + ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50000, 'is_in_stock' => 1]) + ->setQty(50000) + ->save(); From 3fbdc45b535aee0b08b770b564d03b8a70d920fb Mon Sep 17 00:00:00 2001 From: Ievgenii Gryshkun Date: Tue, 19 Feb 2019 09:23:29 +0200 Subject: [PATCH 3/7] Fix message when maxSaleQty is set and qty is more than maxSaleQty --- .../Quote/AddSimpleProductToCartTest.php | 28 +++++++++++++------ .../Magento/Catalog/_files/products.php | 13 --------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php index 28bf755911ce..26c84fa0559e 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php @@ -12,6 +12,7 @@ use Magento\Quote\Model\Quote; use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface; use Magento\Quote\Model\ResourceModel\Quote as QuoteResource; +use Magento\Config\Model\ResourceModel\Config; class AddSimpleProductToCartTest extends GraphQlAbstract { @@ -30,6 +31,11 @@ class AddSimpleProductToCartTest extends GraphQlAbstract */ private $quoteIdToMaskedId; + /** + * @var Config + */ + private $config; + /** * @inheritdoc */ @@ -39,6 +45,7 @@ protected function setUp() $this->quoteResource = $objectManager->get(QuoteResource::class); $this->quote = $objectManager->create(Quote::class); $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class); + $this->config = $objectManager->get(Config::class); } /** @@ -60,15 +67,18 @@ public function testAddSimpleProductsToCart() /** * @magentoApiDataFixture Magento/Catalog/_files/products.php + * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php * @expectedException \Exception - * @expectedExceptionMessage The requested qty is not available + * @expectedExceptionMessage The most you may purchase is 5. */ - public function testAddProductIfQuantityIsNotAvailable() + public function testAddMoreProductsThatAllowed() { $sku = 'simple'; - $qty = 200; + $qty = 7; + $maxQty = 5; + $this->config->saveConfig('cataloginventory/item_options/max_sale_qty', $maxQty, 'default', 0); $maskedQuoteId = $this->getMaskedQuoteId(); $query = $this->getQueryAddSimpleProduct($maskedQuoteId, $sku, $qty); $this->graphQlQuery($query); @@ -78,23 +88,23 @@ public function testAddProductIfQuantityIsNotAvailable() * @magentoApiDataFixture Magento/Catalog/_files/products.php * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php * @expectedException \Exception - * @expectedExceptionMessage The most you may purchase is 10000. + * @expectedExceptionMessage The requested qty is not available */ - public function testAddMoreProductsThatAllowed() + public function testAddProductIfQuantityIsNotAvailable() { - $sku = 'simple-product-with-huge-amount'; - $qty = 20000; + $sku = 'simple'; + $qty = 200; + $maskedQuoteId = $this->getMaskedQuoteId(); $query = $this->getQueryAddSimpleProduct($maskedQuoteId, $sku, $qty); $this->graphQlQuery($query); } /** - * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php * @return string * @throws \Magento\Framework\Exception\NoSuchEntityException */ - public function getMaskedQuoteId() + public function getMaskedQuoteId() : string { $this->quoteResource->load( $this->quote, diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products.php index 407cc31e0c39..348701a99f28 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products.php @@ -36,16 +36,3 @@ ->setStockData(['use_config_manage_stock' => 1, 'qty' => 24, 'is_in_stock' => 1]) ->setQty(24) ->save(); - -$productWithHugeQty = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() - ->create(\Magento\Catalog\Model\Product::class, ['data' => $product->getData()]); - -$productWithHugeQty->setUrlKey('simple-product-with-huge-amount') - ->setId(2) - ->setRowId(2) - ->setName('Simple Product With Huge Amount') - ->setSku('simple-product-with-huge-amount') - ->setCustomDesign('Magento/blank') - ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50000, 'is_in_stock' => 1]) - ->setQty(50000) - ->save(); From e18e4ace01a29644f2d3e7dcf685e8e8bbe3000f Mon Sep 17 00:00:00 2001 From: Ievgenii Gryshkun Date: Tue, 19 Feb 2019 11:37:16 +0200 Subject: [PATCH 4/7] Fix message when maxSaleQty is set and qty is more than maxSaleQty --- .../Quote/AddSimpleProductToCartTest.php | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php index 26c84fa0559e..c877ba555039 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php @@ -67,18 +67,15 @@ public function testAddSimpleProductsToCart() /** * @magentoApiDataFixture Magento/Catalog/_files/products.php - * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php * @expectedException \Exception - * @expectedExceptionMessage The most you may purchase is 5. + * @expectedExceptionMessage The requested qty is not available */ - public function testAddMoreProductsThatAllowed() + public function testAddProductIfQuantityIsNotAvailable() { $sku = 'simple'; - $qty = 7; - $maxQty = 5; + $qty = 200; - $this->config->saveConfig('cataloginventory/item_options/max_sale_qty', $maxQty, 'default', 0); $maskedQuoteId = $this->getMaskedQuoteId(); $query = $this->getQueryAddSimpleProduct($maskedQuoteId, $sku, $qty); $this->graphQlQuery($query); @@ -87,14 +84,15 @@ public function testAddMoreProductsThatAllowed() /** * @magentoApiDataFixture Magento/Catalog/_files/products.php * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php - * @expectedException \Exception - * @expectedExceptionMessage The requested qty is not available + * @expectedExceptionMessage The most you may purchase is 5. */ - public function testAddProductIfQuantityIsNotAvailable() + public function testAddMoreProductsThatAllowed() { - $sku = 'simple'; - $qty = 200; + $sku = 'custom-design-simple-product'; + $qty = 7; + $maxQty = 5; + $this->config->saveConfig('cataloginventory/item_options/max_sale_qty', $maxQty, 'default', 0); $maskedQuoteId = $this->getMaskedQuoteId(); $query = $this->getQueryAddSimpleProduct($maskedQuoteId, $sku, $qty); $this->graphQlQuery($query); @@ -102,7 +100,6 @@ public function testAddProductIfQuantityIsNotAvailable() /** * @return string - * @throws \Magento\Framework\Exception\NoSuchEntityException */ public function getMaskedQuoteId() : string { From 4db921f0dbc31f0a1d1bd6dc8937593c9951ecb6 Mon Sep 17 00:00:00 2001 From: Valerii Naida Date: Wed, 27 Feb 2019 11:40:54 -0600 Subject: [PATCH 5/7] GraphQL-293: When maxSaleQty is set and qty is more than maxSaleQty the "The most you may purchase is %1." message should be sent instead of "Internal server error" --- .../Model/Cart/AddProductsToCart.php | 7 + .../CatalogInventory/AddProductToCartTest.php | 123 ++++++++++++++++++ .../Quote/AddSimpleProductToCartTest.php | 68 ++-------- 3 files changed, 143 insertions(+), 55 deletions(-) create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php index 6deb387476d5..005cf3a10ca8 100644 --- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php +++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php @@ -46,6 +46,7 @@ public function __construct( * @param array $cartItems * @throws GraphQlInputException * @throws \Magento\Framework\Exception\LocalizedException + * @throws \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException */ public function execute(Quote $cart, array $cartItems): void { @@ -53,6 +54,12 @@ public function execute(Quote $cart, array $cartItems): void $this->addProductToCart->execute($cart, $cartItemData); } + if ($cart->getData('has_error')) { + throw new GraphQlInputException( + __('Shopping cart error: %message', ['message' => $this->getCartErrors($cart)]) + ); + } + $this->cartRepository->save($cart); } diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php new file mode 100644 index 000000000000..947d48f8e15c --- /dev/null +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php @@ -0,0 +1,123 @@ +quoteResource = $objectManager->get(QuoteResource::class); + $this->quoteFactory = $objectManager->get(QuoteFactory::class); + $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class); + } + + /** + * @magentoApiDataFixture Magento/Catalog/_files/products.php + * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php + * @expectedException \Exception + * @expectedExceptionMessage The requested qty is not available + */ + public function testAddProductIfQuantityIsNotAvailable() + { + $sku = 'simple'; + $qty = 200; + + $maskedQuoteId = $this->getMaskedQuoteId(); + $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty); + $this->graphQlQuery($query); + } + + /** + * @magentoApiDataFixture Magento/Catalog/_files/products.php + * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php + * @magentoConfigFixture default cataloginventory/item_options/max_sale_qty 5 + * @expectedException \Exception + * @expectedExceptionMessage The most you may purchase is 5. + */ + public function testAddMoreProductsThatAllowed() + { + $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167'); + + $sku = 'custom-design-simple-product'; + $qty = 7; + + $maskedQuoteId = $this->getMaskedQuoteId(); + $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty); + $this->graphQlQuery($query); + } + + /** + * @return string + */ + public function getMaskedQuoteId() : string + { + $quote = $this->quoteFactory->create(); + $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id'); + + return $this->quoteIdToMaskedId->execute((int)$quote->getId()); + } + + /** + * @param string $maskedQuoteId + * @param string $sku + * @param int $qty + * @return string + */ + public function getAddSimpleProductQuery(string $maskedQuoteId, string $sku, int $qty) : string + { + return <<quoteResource = $objectManager->get(QuoteResource::class); - $this->quote = $objectManager->create(Quote::class); + $this->quoteFactory = $objectManager->get(QuoteFactory::class); $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class); - $this->config = $objectManager->get(Config::class); } /** @@ -57,45 +50,13 @@ public function testAddSimpleProductsToCart() $sku = 'simple'; $qty = 2; $maskedQuoteId = $this->getMaskedQuoteId(); - $query = $this->getQueryAddSimpleProduct($maskedQuoteId, $sku, $qty); + + $query = $this->geAddSimpleProducttQuery($maskedQuoteId, $sku, $qty); $response = $this->graphQlQuery($query); self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']); - $cartQty = $response['addSimpleProductsToCart']['cart']['items'][0]['qty']; - - $this->assertEquals($qty, $cartQty); - } - - /** - * @magentoApiDataFixture Magento/Catalog/_files/products.php - * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php - * @expectedException \Exception - * @expectedExceptionMessage The requested qty is not available - */ - public function testAddProductIfQuantityIsNotAvailable() - { - $sku = 'simple'; - $qty = 200; - - $maskedQuoteId = $this->getMaskedQuoteId(); - $query = $this->getQueryAddSimpleProduct($maskedQuoteId, $sku, $qty); - $this->graphQlQuery($query); - } - /** - * @magentoApiDataFixture Magento/Catalog/_files/products.php - * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php - * @expectedExceptionMessage The most you may purchase is 5. - */ - public function testAddMoreProductsThatAllowed() - { - $sku = 'custom-design-simple-product'; - $qty = 7; - $maxQty = 5; - - $this->config->saveConfig('cataloginventory/item_options/max_sale_qty', $maxQty, 'default', 0); - $maskedQuoteId = $this->getMaskedQuoteId(); - $query = $this->getQueryAddSimpleProduct($maskedQuoteId, $sku, $qty); - $this->graphQlQuery($query); + $cartQty = $response['addSimpleProductsToCart']['cart']['items'][0]['qty']; + self::assertEquals($qty, $cartQty); } /** @@ -103,22 +64,19 @@ public function testAddMoreProductsThatAllowed() */ public function getMaskedQuoteId() : string { - $this->quoteResource->load( - $this->quote, - 'test_order_1', - 'reserved_order_id' - ); - return $this->quoteIdToMaskedId->execute((int)$this->quote->getId()); + $quote = $this->quoteFactory->create(); + $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id'); + + return $this->quoteIdToMaskedId->execute((int)$quote->getId()); } /** * @param string $maskedQuoteId * @param string $sku * @param int $qty - * * @return string */ - public function getQueryAddSimpleProduct(string $maskedQuoteId, string $sku, int $qty) : string + public function geAddSimpleProducttQuery(string $maskedQuoteId, string $sku, int $qty) : string { return << Date: Thu, 28 Feb 2019 08:44:38 +0200 Subject: [PATCH 6/7] Fix message when maxSaleQty is set and qty is more than maxSaleQty #367 --- .../Magento/GraphQl/CatalogInventory/AddProductToCartTest.php | 3 --- .../Magento/GraphQl/Quote/AddSimpleProductToCartTest.php | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php index 947d48f8e15c..4ca1fdf4e8db 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php @@ -61,13 +61,10 @@ public function testAddProductIfQuantityIsNotAvailable() * @magentoApiDataFixture Magento/Catalog/_files/products.php * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php * @magentoConfigFixture default cataloginventory/item_options/max_sale_qty 5 - * @expectedException \Exception * @expectedExceptionMessage The most you may purchase is 5. */ public function testAddMoreProductsThatAllowed() { - $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167'); - $sku = 'custom-design-simple-product'; $qty = 7; diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php index 36f8af622cfc..c1a45f100fde 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php @@ -51,7 +51,7 @@ public function testAddSimpleProductsToCart() $qty = 2; $maskedQuoteId = $this->getMaskedQuoteId(); - $query = $this->geAddSimpleProducttQuery($maskedQuoteId, $sku, $qty); + $query = $this->geAddSimpleProductQuery($maskedQuoteId, $sku, $qty); $response = $this->graphQlQuery($query); self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']); @@ -76,7 +76,7 @@ public function getMaskedQuoteId() : string * @param int $qty * @return string */ - public function geAddSimpleProducttQuery(string $maskedQuoteId, string $sku, int $qty) : string + public function geAddSimpleProductQuery(string $maskedQuoteId, string $sku, int $qty) : string { return << Date: Fri, 1 Mar 2019 09:47:27 -0600 Subject: [PATCH 7/7] GraphQL-293: When maxSaleQty is set and qty is more than maxSaleQty the "The most you may purchase is %1." message should be sent instead of "Internal server error" --- .../CatalogInventory/AddProductToCartTest.php | 6 ++- .../Quote/AddSimpleProductToCartTest.php | 54 +++++++++++++------ 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php index 4ca1fdf4e8db..17c2af8dc59d 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogInventory/AddProductToCartTest.php @@ -55,22 +55,27 @@ public function testAddProductIfQuantityIsNotAvailable() $maskedQuoteId = $this->getMaskedQuoteId(); $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty); $this->graphQlQuery($query); + self::fail('Should be "The requested qty is not available" error message.'); } /** * @magentoApiDataFixture Magento/Catalog/_files/products.php * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php * @magentoConfigFixture default cataloginventory/item_options/max_sale_qty 5 + * @expectedException \Exception * @expectedExceptionMessage The most you may purchase is 5. */ public function testAddMoreProductsThatAllowed() { + $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/167'); + $sku = 'custom-design-simple-product'; $qty = 7; $maskedQuoteId = $this->getMaskedQuoteId(); $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty); $this->graphQlQuery($query); + self::fail('Should be "The most you may purchase is 5." error message.'); } /** @@ -108,7 +113,6 @@ public function getAddSimpleProductQuery(string $maskedQuoteId, string $sku, int } ) { cart { - cart_id items { qty } diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php index d5bdb942e9b2..3bda57381e9d 100644 --- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php +++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php @@ -9,7 +9,7 @@ use Magento\TestFramework\Helper\Bootstrap; use Magento\TestFramework\TestCase\GraphQlAbstract; -use Magento\Quote\Model\Quote; +use Magento\Quote\Model\QuoteFactory; use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface; use Magento\Quote\Model\ResourceModel\Quote as QuoteResource; @@ -21,9 +21,9 @@ class AddSimpleProductToCartTest extends GraphQlAbstract private $quoteResource; /** - * @var Quote + * @var QuoteFactory */ - private $quote; + private $quoteFactory; /** * @var QuoteIdToMaskedQuoteIdInterface @@ -37,29 +37,48 @@ protected function setUp() { $objectManager = Bootstrap::getObjectManager(); $this->quoteResource = $objectManager->get(QuoteResource::class); - $this->quote = $objectManager->create(Quote::class); + $this->quoteFactory = $objectManager->get(QuoteFactory::class); $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class); } /** * @magentoApiDataFixture Magento/Catalog/_files/products.php * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php - * @expectedException \Exception - * @expectedExceptionMessage The requested qty is not available */ - public function testAddProductIfQuantityIsNotAvailable() + public function testAddSimpleProductToCart() { $sku = 'simple'; - $qty = 200; + $qty = 2; + $maskedQuoteId = $this->getMaskedQuoteId(); - $this->quoteResource->load( - $this->quote, - 'test_order_1', - 'reserved_order_id' - ); - $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId()); + $query = $this->getAddSimpleProductQuery($maskedQuoteId, $sku, $qty); + $response = $this->graphQlQuery($query); + self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']); - $query = <<quoteFactory->create(); + $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id'); + + return $this->quoteIdToMaskedId->execute((int)$quote->getId()); + } + + /** + * @param string $maskedQuoteId + * @param string $sku + * @param int $qty + * @return string + */ + public function getAddSimpleProductQuery(string $maskedQuoteId, string $sku, int $qty): string + { + return <<graphQlQuery($query); } }