From a48c08774ce768031863370c8bb6450ce17b699f Mon Sep 17 00:00:00 2001
From: Bartek Igielski <igloczek@gmail.com>
Date: Sun, 9 Sep 2018 16:04:28 +0200
Subject: [PATCH 01/21] Loader replaced with actual product photo to visualy
 speedup loading

---
 .../templates/product/view/gallery.phtml      | 30 +++++--------------
 lib/web/mage/gallery/gallery.less             | 10 +++----
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 1bfa30478df8a..79714d5bf9035 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -12,32 +12,16 @@
  * @var $block \Magento\Catalog\Block\Product\View\Gallery
  */
 ?>
+
+<?php $images = $block->getGalleryImages()->toArray()['items'] ?>
+
 <div class="gallery-placeholder _block-content-loading" data-gallery-role="gallery-placeholder">
-    <div data-role="loader" class="loading-mask">
-        <div class="loader">
-            <img src="<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>"
-                 alt="<?= /* @escapeNotVerified */ __('Loading...') ?>">
-        </div>
-    </div>
+    <img
+        class="gallery-placeholder__image"
+        src="<?= $images[0]['medium_image_url'] ?>"
+    />
 </div>
-<!--Fix for jumping content. Loader must be the same size as gallery.-->
-<script>
-    var config = {
-            "width": <?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'width') ?>,
-            "thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height')
-                        ?: $block->getImageAttribute('product_page_image_small', 'width'); ?>,
-            "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navtype") ?>",
-            "height": <?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'height') ?>
-        },
-        thumbBarHeight = 0,
-        loader = document.querySelectorAll('[data-gallery-role="gallery-placeholder"] [data-role="loader"]')[0];
 
-    if (config.navtype === 'horizontal') {
-        thumbBarHeight = config.thumbheight;
-    }
-
-    loader.style.paddingBottom = ( config.height / config.width * 100) + "%";
-</script>
 <script type="text/x-magento-init">
     {
         "[data-gallery-role=gallery-placeholder]": {
diff --git a/lib/web/mage/gallery/gallery.less b/lib/web/mage/gallery/gallery.less
index 3c35a772253bc..4b7ff77e60265 100644
--- a/lib/web/mage/gallery/gallery.less
+++ b/lib/web/mage/gallery/gallery.less
@@ -976,12 +976,9 @@
 
 // While first time init
 .gallery-placeholder {
-    .loading-mask {
-        padding: 0 0 50%;
-        position: static;
-    }
-    .loader img {
-        position: absolute;
+    &__image {
+        display: block;
+        margin: auto;
     }
 }
 
@@ -1002,6 +999,7 @@
         display: block;
     }
 }
+
 .fotorama__product-video--loaded {
     .fotorama__img, .fotorama__img--full {
         display: none !important;

From 3f3489de37b58d05e4f3be918361339ae2d29c52 Mon Sep 17 00:00:00 2001
From: Bartek Igielski <igloczek@gmail.com>
Date: Mon, 10 Sep 2018 08:51:28 +0200
Subject: [PATCH 02/21] Placeholder fallback. Unescaped output comment.

---
 .../Catalog/Block/Product/View/Gallery.php        | 15 +++++++++++++++
 .../frontend/templates/product/view/gallery.phtml |  4 +---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index ab01fc6d134e9..ff8976130e9bd 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -233,4 +233,19 @@ private function getGalleryImagesConfig()
 
         return $this->getData('gallery_images_config');
     }
+
+    /**
+     * @param string $image
+     * @return string
+     */
+    public function getMainProductImage()
+    {
+        $image = $this->getGalleryImages()->toArray()['items'][0]['medium_image_url'];
+
+        if (!$image) {
+            return $this->_imageHelper->getDefaultPlaceholderUrl('image');
+        }
+
+        return $image;
+    }
 }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 79714d5bf9035..820e6cc969175 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -13,12 +13,10 @@
  */
 ?>
 
-<?php $images = $block->getGalleryImages()->toArray()['items'] ?>
-
 <div class="gallery-placeholder _block-content-loading" data-gallery-role="gallery-placeholder">
     <img
         class="gallery-placeholder__image"
-        src="<?= $images[0]['medium_image_url'] ?>"
+        src="<?= /* @escapeNotVerified */ $block->getMainProductImage() ?>"
     />
 </div>
 

From 697f7691da7b0892c6f98b022517e0dbad50958b Mon Sep 17 00:00:00 2001
From: Bartek Igielski <igloczek@gmail.com>
Date: Wed, 19 Sep 2018 18:11:12 +0200
Subject: [PATCH 03/21] Pretier PHP code to make world a better place

---
 .../Catalog/Block/Product/View/Gallery.php        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index ff8976130e9bd..f26eeed1f5755 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -235,17 +235,18 @@ private function getGalleryImagesConfig()
     }
 
     /**
-     * @param string $image
      * @return string
      */
-    public function getMainProductImage()
+    public function getMainProductImage($size = 'medium_image_url')
     {
-        $image = $this->getGalleryImages()->toArray()['items'][0]['medium_image_url'];
+        foreach ($this->getGalleryImages() as $image) {
+            $image = $image->getData($size);
 
-        if (!$image) {
-            return $this->_imageHelper->getDefaultPlaceholderUrl('image');
-        }
+            if (!$image) {
+                return $this->_imageHelper->getDefaultPlaceholderUrl('image');
+            }
 
-        return $image;
+            return $image;
+        }
     }
 }

From 4b25bbc3c9a99c782f4476c591bf1b3f9b6979f1 Mon Sep 17 00:00:00 2001
From: Bartek Igielski <igloczek@gmail.com>
Date: Wed, 19 Sep 2018 18:15:10 +0200
Subject: [PATCH 04/21] Size param docs update

---
 app/code/Magento/Catalog/Block/Product/View/Gallery.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index f26eeed1f5755..3e2330ffb03a3 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -235,6 +235,7 @@ private function getGalleryImagesConfig()
     }
 
     /**
+     * @param string $size
      * @return string
      */
     public function getMainProductImage($size = 'medium_image_url')

From d128271192077a456e8ac5bf7558722637fea01b Mon Sep 17 00:00:00 2001
From: Bartek Igielski <igloczek@gmail.com>
Date: Thu, 20 Sep 2018 15:09:11 +0200
Subject: [PATCH 05/21] Docs update

Damn, this PHP CS lint output is soo useless
---
 app/code/Magento/Catalog/Block/Product/View/Gallery.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index 3e2330ffb03a3..6ec46e6efab86 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -235,6 +235,8 @@ private function getGalleryImagesConfig()
     }
 
     /**
+     * Get main product image
+     *
      * @param string $size
      * @return string
      */

From 4e10da635640e890a42840a78eae5eee22dd53a2 Mon Sep 17 00:00:00 2001
From: RomanKis <roman.kis.y@gmail.com>
Date: Tue, 19 Mar 2019 16:48:51 +0200
Subject: [PATCH 06/21] graphQl-470: Creating/getting Cart queries should
 support Store context

---
 .../Model/Cart/GetCartForUser.php             | 20 ++++++-
 .../Quote/Customer/CreateEmptyCartTest.php    | 53 +++++++++++++++++++
 .../GraphQl/Quote/Customer/GetCartTest.php    | 52 ++++++++++++++++++
 .../Quote/Guest/CreateEmptyCartTest.php       | 24 +++++++++
 .../GraphQl/Quote/Guest/GetCartTest.php       | 48 +++++++++++++++++
 .../_files/active_quote_not_default_store.php | 23 ++++++++
 ...ctive_quote_not_default_store_rollback.php |  8 +++
 7 files changed, 227 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store_rollback.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
index 145e9c01980a5..ea86dca06271a 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -13,6 +13,7 @@
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
 use Magento\Quote\Model\Quote;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Get cart
@@ -29,16 +30,24 @@ class GetCartForUser
      */
     private $cartRepository;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
      * @param CartRepositoryInterface $cartRepository
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
-        CartRepositoryInterface $cartRepository
+        CartRepositoryInterface $cartRepository,
+        StoreManagerInterface $storeManager
     ) {
         $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
         $this->cartRepository = $cartRepository;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -75,6 +84,15 @@ public function execute(string $cartHash, ?int $customerId): Quote
             );
         }
 
+        if ((int)$cart->getStoreId() !== (int)$this->storeManager->getStore()->getId()) {
+            throw new GraphQlAuthorizationException(
+                __(
+                    'Wrong store code specified for cart "%masked_cart_id"',
+                    ['masked_cart_id' => $cartHash]
+                )
+            );
+        }
+
         $cartCustomerId = (int)$cart->getCustomerId();
 
         /* Guest cart, allow operations */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
index 0cb8a38b0cb5e..7539945456530 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -27,11 +28,17 @@ class CreateEmptyCartTest extends GraphQlAbstract
      */
     private $customerTokenService;
 
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->guestCartRepository = $objectManager->get(GuestCartRepositoryInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->resourceConnection = $objectManager->get(ResourceConnection::class);
     }
 
     /**
@@ -57,5 +64,51 @@ public function testCreateEmptyCart()
 
         self::assertNotNull($guestCart->getId());
         self::assertEquals(1, $guestCart->getCustomer()->getId());
+        self::assertSame('default', $guestCart->getStore()->getCode());
+
+        $this->deleteCreatedQuote($guestCart->getId());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testCreateEmptyCartWithNotDefaultStore()
+    {
+        $query = <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
+
+        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken, 'Store' => 'fixture_second_store'];
+
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+        self::assertArrayHasKey('createEmptyCart', $response);
+
+        $maskedCartId = $response['createEmptyCart'];
+        /* guestCartRepository is used for registered customer to get the cart hash */
+        $guestCart = $this->guestCartRepository->get($maskedCartId);
+
+        self::assertNotNull($guestCart->getId());
+        self::assertEquals(1, $guestCart->getCustomer()->getId());
+        self::assertSame('fixture_second_store', $guestCart->getStore()->getCode());
+
+        $this->deleteCreatedQuote($guestCart->getId());
+    }
+
+    /**
+     * Delete active quote for customer by customer id.
+     * This is needed to have ability to create new quote for another store and not return the active one.
+     * @see QuoteManagement::createCustomerCart
+     *
+     * @param $quoteId
+     */
+    private function deleteCreatedQuote($quoteId)
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $connection->query('DELETE FROM quote WHERE entity_id = ' . $quoteId);
     }
 }
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
index 4b1509eef354e..6581fae63e9e3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -134,6 +134,58 @@ public function testGetInactiveCart()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     */
+    public function testGetCartWithNotDefaultStore()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $headerMap = $this->getHeaderMap();
+        $headerMap['Store'] = 'fixture_second_store';
+
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('items', $response['cart']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Wrong store code specified for cart
+     */
+    public function testGetCartWithWrongStore()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $headerMap = $this->getHeaderMap();
+        $headerMap['Store'] = 'fixture_second_store';
+
+        $this->graphQlQuery($query, [], '', $headerMap);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Store code not_existing_store does not exist
+     */
+    public function testGetCartWithNotExistingStore()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $headerMap = $this->getHeaderMap();
+        $headerMap['Store'] = 'not_existing_store';
+
+        $this->graphQlQuery($query, [], '', $headerMap);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @return string
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
index 4fd398439913e..b283e7ef721a8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
@@ -44,4 +44,28 @@ public function testCreateEmptyCart()
         self::assertNotNull($guestCart->getId());
         self::assertNull($guestCart->getCustomer()->getId());
     }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
+     */
+    public function testCreateEmptyCartWithNotDefaultStore()
+    {
+        $query = <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
+        $headerMap = ['Store' => 'fixture_second_store'];
+
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+        self::assertArrayHasKey('createEmptyCart', $response);
+
+        $maskedCartId = $response['createEmptyCart'];
+        $guestCart = $this->guestCartRepository->get($maskedCartId);
+
+        self::assertNotNull($guestCart->getId());
+        self::assertNull($guestCart->getCustomer()->getId());
+        self::assertSame('fixture_second_store', $guestCart->getStore()->getCode());
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index 916d5951b0ff2..46c33faa088e8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -115,6 +115,54 @@ public function testGetInactiveCart()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     */
+    public function testGetCartWithNotDefaultStore()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $headerMap = ['Store' => 'fixture_second_store'];
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('items', $response['cart']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Wrong store code specified for cart
+     */
+    public function testGetCartWithWrongStore()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $headerMap = ['Store' => 'fixture_second_store'];
+        $this->graphQlQuery($query, [], '', $headerMap);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Store code not_existing_store does not exist
+     */
+    public function testGetCartWithNotExistingStore()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
+
+        $headerMap['Store'] = 'not_existing_store';
+        $query = $this->getCartQuery($maskedQuoteId);
+
+        $this->graphQlQuery($query, [], '', $headerMap);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @return string
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store.php
new file mode 100644
index 0000000000000..6448a570424e2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+include 'testsuite/Magento/Store/_files/second_store.php';
+include 'testsuite/Magento/Customer/_files/customer.php';
+
+$quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+$quote->setStoreId($store->getId())
+    ->setIsActive(true)
+    ->setIsMultiShipping(false)
+    ->setReservedOrderId('test_order_1_not_default_store')
+    ->setCustomerId($customer->getId())
+    ->save();
+
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+    ->create();
+$quoteIdMask->setQuoteId($quote->getId());
+$quoteIdMask->setDataChanges(true);
+$quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store_rollback.php
new file mode 100644
index 0000000000000..e3e1513cb6144
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+$quote->load('test_order_1_not_default_store', 'reserved_order_id')->delete();

From 5c84ea9501971f455e5b3e01b956102782c49b8a Mon Sep 17 00:00:00 2001
From: RomanKis <roman.kis.y@gmail.com>
Date: Fri, 22 Mar 2019 11:46:30 +0200
Subject: [PATCH 07/21] graphQl-470: Creating/getting Cart queries should
 support Store context

---
 .../GraphQl/Quote/Customer/GetCartTest.php    |  4 ++--
 .../GraphQl/Quote/Guest/GetCartTest.php       |  8 +++----
 ...tive_quote_customer_not_default_store.php} |  0
 ...e_customer_not_default_store_rollback.php} |  0
 .../active_quote_guest_not_default_store.php  | 21 +++++++++++++++++++
 ...quote_guest_not_default_store_rollback.php |  8 +++++++
 6 files changed, 35 insertions(+), 6 deletions(-)
 rename dev/tests/integration/testsuite/Magento/Checkout/_files/{active_quote_not_default_store.php => active_quote_customer_not_default_store.php} (100%)
 rename dev/tests/integration/testsuite/Magento/Checkout/_files/{active_quote_not_default_store_rollback.php => active_quote_customer_not_default_store_rollback.php} (100%)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store_rollback.php

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
index 6581fae63e9e3..7b0f03a195958 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -135,7 +135,7 @@ public function testGetInactiveCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_customer_not_default_store.php
      */
     public function testGetCartWithNotDefaultStore()
     {
@@ -170,7 +170,7 @@ public function testGetCartWithWrongStore()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_customer_not_default_store.php
      *
      * @expectedException \Exception
      * @expectedExceptionMessage Store code not_existing_store does not exist
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index 46c33faa088e8..f8404666e5d26 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -116,11 +116,11 @@ public function testGetInactiveCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_guest_not_default_store.php
      */
     public function testGetCartWithNotDefaultStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store_guest');
         $query = $this->getCartQuery($maskedQuoteId);
 
         $headerMap = ['Store' => 'fixture_second_store'];
@@ -148,14 +148,14 @@ public function testGetCartWithWrongStore()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_not_default_store.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_guest_not_default_store.php
      *
      * @expectedException \Exception
      * @expectedExceptionMessage Store code not_existing_store does not exist
      */
     public function testGetCartWithNotExistingStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store_guest');
 
         $headerMap['Store'] = 'not_existing_store';
         $query = $this->getCartQuery($maskedQuoteId);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store.php
rename to dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store.php
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store_rollback.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_not_default_store_rollback.php
rename to dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php
new file mode 100644
index 0000000000000..bbd3d5efbe8c8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+include 'testsuite/Magento/Store/_files/second_store.php';
+
+$quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+$quote->setStoreId($store->getId())
+    ->setIsActive(true)
+    ->setIsMultiShipping(false)
+    ->setReservedOrderId('test_order_1_not_default_store_guest')
+    ->save();
+
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+    ->create();
+$quoteIdMask->setQuoteId($quote->getId());
+$quoteIdMask->setDataChanges(true);
+$quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store_rollback.php
new file mode 100644
index 0000000000000..f511133280e7f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_guest_not_default_store_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+$quote->load('test_order_1_not_default_store_guest', 'reserved_order_id')->delete();

From c2c04e9fa9eb6c6f7e1a7923da3dc89ca39894de Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 27 Mar 2019 15:52:25 +0200
Subject: [PATCH 08/21] magento/graphql-ce#544: Replace deprecated fixtures in
 RemoveItemFromCartTest

---
 .../Quote/Customer/RemoveItemFromCartTest.php | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

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
index e80a2127ad420..5f023086e89e1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
@@ -56,12 +56,15 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testRemoveItemFromCart()
     {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+        $this->quoteResource->load($quote, 'test_quote', 'reserved_order_id');
         $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
         $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
 
@@ -85,12 +88,15 @@ public function testRemoveItemFromNonExistentCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testRemoveNonExistentItem()
     {
         $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+        $this->quoteResource->load($quote, 'test_quote', 'reserved_order_id');
         $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
         $notExistentItemId = 999;
 
@@ -101,13 +107,16 @@ public function testRemoveNonExistentItem()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
      */
     public function testRemoveItemIfItemIsNotBelongToCart()
     {
         $firstQuote = $this->quoteFactory->create();
-        $this->quoteResource->load($firstQuote, 'test_order_1', 'reserved_order_id');
+        $this->quoteResource->load($firstQuote, 'test_quote', 'reserved_order_id');
         $firstQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$firstQuote->getId());
 
         $secondQuote = $this->quoteFactory->create();
@@ -130,14 +139,16 @@ public function testRemoveItemIfItemIsNotBelongToCart()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
      */
     public function testRemoveItemFromGuestCart()
     {
         $guestQuote = $this->quoteFactory->create();
         $this->quoteResource->load(
             $guestQuote,
-            'test_order_with_virtual_product_without_address',
+            'test_quote',
             'reserved_order_id'
         );
         $guestQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$guestQuote->getId());
@@ -154,8 +165,11 @@ public function testRemoveItemFromGuestCart()
     }
 
     /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
      */
     public function testRemoveItemFromAnotherCustomerCart()

From bb7be7ada6f64686116df9fbb79bcb64b226bb7a Mon Sep 17 00:00:00 2001
From: Dmytro Cheshun <mitry@atwix.com>
Date: Mon, 1 Apr 2019 20:33:17 +0300
Subject: [PATCH 09/21] Add API functional tests for ApplyCouponToCart
 functionality

---
 .../Magento/GraphQl/Quote/CouponTest.php      |  85 ----
 .../Quote/Customer/ApplyCouponToCartTest.php  | 416 ++++++++++++++++++
 .../Quote/Guest/ApplyCouponToCartTest.php     | 337 ++++++++++++++
 3 files changed, 753 insertions(+), 85 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
index 828784ca27885..31c03754e048c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CouponTest.php
@@ -41,91 +41,6 @@ protected function setUp()
         $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     */
-    public function testApplyCouponToGuestCartWithItems()
-    {
-        $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $response = $this->graphQlQuery($query);
-
-        self::assertArrayHasKey('applyCouponToCart', $response);
-        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     */
-    public function testApplyCouponTwice()
-    {
-        $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $response = $this->graphQlQuery($query);
-
-        self::assertArrayHasKey("applyCouponToCart", $response);
-        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
-
-        self::expectExceptionMessage('A coupon is already applied to the cart. Please remove it to apply another');
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage Cart does not contain products.
-     */
-    public function testApplyCouponToCartWithNoItems()
-    {
-        $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     */
-    public function testGuestCustomerAttemptToChangeCustomerCart()
-    {
-        $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-
-        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query);
-    }
-
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
new file mode 100644
index 0000000000000..0a1b7036ef977
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
@@ -0,0 +1,416 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Magento\Framework\Exception\AuthenticationException;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\SalesRule\Model\Spi\CouponResourceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test Apply Coupon to Cart functionality for customer
+ */
+class ApplyCouponToCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var CouponResourceInterface
+     */
+    protected $couponResource;
+
+    /**
+     * @var Coupon
+     */
+    private $coupon;
+
+    /**
+     * @var Rule
+     */
+    private $salesRule;
+
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->create(QuoteResource::class);
+        $this->quote = $objectManager->create(Quote::class);
+        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->couponResource = $objectManager->get(CouponResourceInterface::class);
+        $this->coupon = $objectManager->create(Coupon::class);
+        $this->salesRule = $objectManager->create(Rule::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testApplyCouponToCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        self::assertArrayHasKey('applyCouponToCart', $response);
+        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage A coupon is already applied to the cart. Please remove it to apply another
+     */
+    public function testApplyCouponTwice()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+
+        self::assertArrayHasKey("applyCouponToCart", $response);
+        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
+
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Cart does not contain products.
+     */
+    public function testApplyCouponToCartWithoutItems()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     */
+    public function testApplyCouponToGuestCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     */
+    public function testApplyCouponToAnotherCustomerCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(2);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+     */
+    public function testApplyNonExistentCouponToCart()
+    {
+        $couponCode = '1%q#f5';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     */
+    public function testApplyCouponToNonExistentCart()
+    {
+        $couponCode = '2?ds5!2d';
+        $maskedQuoteId = '1hk3y1842h1n';
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+     */
+    public function testApplyExpiredCoupon()
+    {
+        $couponCode = '2?ds5!2d';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        $this->coupon->loadByCode($couponCode);
+        $yesterday = new \DateTime();
+        $yesterday->add(\DateInterval::createFromDateString('-1 day'));
+        $this->coupon->setExpirationDate($yesterday->format('Y-m-d'));
+        $this->couponResource->save($this->coupon);
+
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * Products in cart don't fit to the coupon
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+     */
+    public function testApplyCouponWhichIsNotApplicable()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $this->excludeProductPerCoupon($couponCode, 'simple');
+
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @param string $input
+     * @param string $message
+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     */
+    public function testApplyCouponWithMissedRequiredParameters(string $input, string $message)
+    {
+        $query = <<<QUERY
+mutation {
+  applyCouponToCart(input: {{$input}}) {
+    cart {
+      applied_coupon {
+        code
+      }
+    }
+  }
+}
+QUERY;
+
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
+
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query, [], '', $queryHeaders);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderUpdateWithMissedRequiredParameters(): array
+    {
+        return [
+            'missed_cart_id' => [
+                'coupon_code: "test"',
+                'Required parameter "cart_id" is missing'
+            ],
+            'missed_coupon_code' => [
+                'cart_id: "test"',
+                'Required parameter "coupon_code" is missing'
+            ],
+        ];
+    }
+
+    /**
+     * @param string $couponCode
+     * @param string $sku
+     * @throws \Exception
+     */
+    private function excludeProductPerCoupon(string $couponCode, string $sku)
+    {
+        $this->coupon->loadByCode($couponCode);
+        $ruleId = $this->coupon->getRuleId();
+        $salesRule = $this->salesRule->load($ruleId);
+        $salesRule->getConditions()->loadArray([
+            'type' => \Magento\SalesRule\Model\Rule\Condition\Combine::class,
+            'attribute' => null,
+            'operator' => null,
+            'value' => '1',
+            'is_value_processed' => null,
+            'aggregator' => 'all',
+            'conditions' =>
+                [
+                    [
+                        'type' => \Magento\SalesRule\Model\Rule\Condition\Product\Found::class,
+                        'attribute' => null,
+                        'operator' => null,
+                        'value' => '1',
+                        'is_value_processed' => null,
+                        'aggregator' => 'all',
+                        'conditions' =>
+                            [
+                                [
+                                    'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
+                                    'attribute' => 'sku',
+                                    'operator' => '!=',
+                                    'value' => $sku,
+                                    'is_value_processed' => false,
+                                ],
+                            ],
+                    ],
+                ],
+        ]);
+        $this->salesRule->save();
+    }
+
+    /**
+     * Retrieve customer authorization headers
+     *
+     * @param string $email
+     * @param string $password
+     * @return array
+     * @throws AuthenticationException
+     */
+    private function prepareAuthorizationHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $couponCode
+     * @return string
+     */
+    private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string
+    {
+        return <<<QUERY
+mutation {
+  applyCouponToCart(input: {cart_id: "$maskedQuoteId", coupon_code: "$couponCode"}) {
+    cart {
+      applied_coupon {
+        code
+      }
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
new file mode 100644
index 0000000000000..5c70fb9637dba
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
@@ -0,0 +1,337 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Guest;
+
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\SalesRule\Model\Spi\CouponResourceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test Apply Coupon to Cart functionality for guest
+ */
+class ApplyCouponToCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var CouponResourceInterface
+     */
+    protected $couponResource;
+
+    /**
+     * @var Coupon
+     */
+    private $coupon;
+
+    /**
+     * @var Rule
+     */
+    private $salesRule;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->create(QuoteResource::class);
+        $this->quote = $objectManager->create(Quote::class);
+        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->couponResource = $objectManager->get(CouponResourceInterface::class);
+        $this->coupon = $objectManager->create(Coupon::class);
+        $this->salesRule = $objectManager->create(Rule::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     */
+    public function testApplyCouponToCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('applyCouponToCart', $response);
+        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage A coupon is already applied to the cart. Please remove it to apply another
+     */
+    public function testApplyCouponTwice()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey("applyCouponToCart", $response);
+        self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Cart does not contain products.
+     */
+    public function testApplyCouponToCartWithoutItems()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     */
+    public function testApplyCouponToCustomerCart()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $this->quote->setCustomerId(1);
+        $this->quoteResource->save($this->quote);
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+     */
+    public function testApplyNonExistentCouponToCart()
+    {
+        $couponCode = '1%q#f5';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     */
+    public function testApplyCouponToNonExistentCart()
+    {
+        $couponCode = '2?ds5!2d';
+        $maskedQuoteId = '1hk3y1842h1n';
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+
+        self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId . '"');
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+     */
+    public function testApplyExpiredCoupon()
+    {
+        $couponCode = '2?ds5!2d';
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $this->coupon->loadByCode($couponCode);
+
+        $yesterday = new \DateTime();
+        $yesterday->add(\DateInterval::createFromDateString('-1 day'));
+        $this->coupon->setExpirationDate($yesterday->format('Y-m-d'));
+        $this->couponResource->save($this->coupon);
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Products in cart don't fit to the coupon
+     *
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
+     */
+    public function testApplyCouponWhichIsNotApplicable()
+    {
+        $couponCode = '2?ds5!2d';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_with_simple_product_without_address',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $this->excludeProductPerCoupon($couponCode, 'simple');
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @param string $input
+     * @param string $message
+     * @dataProvider dataProviderUpdateWithMissedRequiredParameters
+     * @expectedException \Exception
+     */
+    public function testApplyCouponWithMissedRequiredParameters(string $input, string $message)
+    {
+        $query = <<<QUERY
+mutation {
+  applyCouponToCart(input: {{$input}}) {
+    cart {
+      applied_coupon {
+        code
+      }
+    }
+  }
+}
+QUERY;
+
+        $this->expectExceptionMessage($message);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderUpdateWithMissedRequiredParameters(): array
+    {
+        return [
+            'missed_cart_id' => [
+                'coupon_code: "test"',
+                'Required parameter "cart_id" is missing'
+            ],
+            'missed_coupon_code' => [
+                'cart_id: "test"',
+                'Required parameter "coupon_code" is missing'
+            ],
+        ];
+    }
+
+    /**
+     * @param string $couponCode
+     * @param string $sku
+     * @throws \Exception
+     */
+    private function excludeProductPerCoupon(string $couponCode, string $sku)
+    {
+        $this->coupon->loadByCode($couponCode);
+        $ruleId = $this->coupon->getRuleId();
+        $salesRule = $this->salesRule->load($ruleId);
+        $salesRule->getConditions()->loadArray([
+            'type' => \Magento\SalesRule\Model\Rule\Condition\Combine::class,
+            'attribute' => null,
+            'operator' => null,
+            'value' => '1',
+            'is_value_processed' => null,
+            'aggregator' => 'all',
+            'conditions' =>
+                [
+                    [
+                        'type' => \Magento\SalesRule\Model\Rule\Condition\Product\Found::class,
+                        'attribute' => null,
+                        'operator' => null,
+                        'value' => '1',
+                        'is_value_processed' => null,
+                        'aggregator' => 'all',
+                        'conditions' =>
+                            [
+                                [
+                                    'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
+                                    'attribute' => 'sku',
+                                    'operator' => '!=',
+                                    'value' => $sku,
+                                    'is_value_processed' => false,
+                                ],
+                            ],
+                    ],
+                ],
+        ]);
+        $this->salesRule->save();
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $couponCode
+     * @return string
+     */
+    private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string
+    {
+        return <<<QUERY
+mutation {
+  applyCouponToCart(input: {cart_id: "$maskedQuoteId", coupon_code: "$couponCode"}) {
+    cart {
+      applied_coupon {
+        code
+      }
+    }
+  }
+}
+QUERY;
+    }
+}

From 149dec143aa5f884056537e79aea9ce53848cd62 Mon Sep 17 00:00:00 2001
From: Dmytro Cheshun <mitry@atwix.com>
Date: Mon, 1 Apr 2019 21:00:27 +0300
Subject: [PATCH 10/21] Code refactoring

---
 .../Quote/Customer/ApplyCouponToCartTest.php  | 77 ++++++++++---------
 .../Quote/Guest/ApplyCouponToCartTest.php     | 73 +++++++++---------
 2 files changed, 78 insertions(+), 72 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
index 0a1b7036ef977..2db2e799f9123 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
@@ -12,8 +12,10 @@
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\SalesRule\Api\Data\ConditionInterface;
+use Magento\SalesRule\Api\Data\ConditionInterfaceFactory;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
 use Magento\SalesRule\Model\Coupon;
-use Magento\SalesRule\Model\Rule;
 use Magento\SalesRule\Model\Spi\CouponResourceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -49,14 +51,19 @@ class ApplyCouponToCartTest extends GraphQlAbstract
     private $coupon;
 
     /**
-     * @var Rule
+     * @var CustomerTokenServiceInterface
      */
-    private $salesRule;
+    private $customerTokenService;
 
     /**
-     * @var CustomerTokenServiceInterface
+     * @var RuleRepositoryInterface
      */
-    private $customerTokenService;
+    private $ruleRepository;
+
+    /**
+     * @var ConditionInterfaceFactory
+     */
+    private $conditionFactory;
 
     protected function setUp()
     {
@@ -66,8 +73,9 @@ protected function setUp()
         $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
         $this->couponResource = $objectManager->get(CouponResourceInterface::class);
         $this->coupon = $objectManager->create(Coupon::class);
-        $this->salesRule = $objectManager->create(Rule::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
+        $this->conditionFactory = $objectManager->get(ConditionInterfaceFactory::class);
     }
 
     /**
@@ -347,37 +355,32 @@ private function excludeProductPerCoupon(string $couponCode, string $sku)
     {
         $this->coupon->loadByCode($couponCode);
         $ruleId = $this->coupon->getRuleId();
-        $salesRule = $this->salesRule->load($ruleId);
-        $salesRule->getConditions()->loadArray([
-            'type' => \Magento\SalesRule\Model\Rule\Condition\Combine::class,
-            'attribute' => null,
-            'operator' => null,
-            'value' => '1',
-            'is_value_processed' => null,
-            'aggregator' => 'all',
-            'conditions' =>
-                [
-                    [
-                        'type' => \Magento\SalesRule\Model\Rule\Condition\Product\Found::class,
-                        'attribute' => null,
-                        'operator' => null,
-                        'value' => '1',
-                        'is_value_processed' => null,
-                        'aggregator' => 'all',
-                        'conditions' =>
-                            [
-                                [
-                                    'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
-                                    'attribute' => 'sku',
-                                    'operator' => '!=',
-                                    'value' => $sku,
-                                    'is_value_processed' => false,
-                                ],
-                            ],
-                    ],
-                ],
-        ]);
-        $this->salesRule->save();
+        $salesRule = $this->ruleRepository->getById($ruleId);
+
+        /** @var ConditionInterface $conditionProductSku */
+        $conditionProductSku = $this->conditionFactory->create();
+        $conditionProductSku->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product::class);
+        $conditionProductSku->setAttributeName('sku');
+        $conditionProductSku->setValue('1');
+        $conditionProductSku->setOperator('!=');
+        $conditionProductSku->setValue($sku);
+
+        /** @var ConditionInterface $conditionProductFound */
+        $conditionProductFound = $this->conditionFactory->create();
+        $conditionProductFound->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product\Found::class);
+        $conditionProductFound->setValue('1');
+        $conditionProductFound->setAggregatorType('all');
+        $conditionProductFound->setConditions([$conditionProductSku]);
+
+        /** @var ConditionInterface $conditionCombine */
+        $conditionCombine = $this->conditionFactory->create();
+        $conditionCombine->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Combine::class);
+        $conditionCombine->setValue('1');
+        $conditionCombine->setAggregatorType('all');
+        $conditionCombine->setConditions([$conditionProductFound]);
+
+        $salesRule->setCondition($conditionCombine);
+        $this->ruleRepository->save($salesRule);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
index 5c70fb9637dba..51644a9fe8c55 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
@@ -10,8 +10,10 @@
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\SalesRule\Api\Data\ConditionInterface;
+use Magento\SalesRule\Api\Data\ConditionInterfaceFactory;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
 use Magento\SalesRule\Model\Coupon;
-use Magento\SalesRule\Model\Rule;
 use Magento\SalesRule\Model\Spi\CouponResourceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -47,9 +49,14 @@ class ApplyCouponToCartTest extends GraphQlAbstract
     private $coupon;
 
     /**
-     * @var Rule
+     * @var RuleRepositoryInterface
      */
-    private $salesRule;
+    private $ruleRepository;
+
+    /**
+     * @var ConditionInterfaceFactory
+     */
+    private $conditionFactory;
 
     protected function setUp()
     {
@@ -59,7 +66,8 @@ protected function setUp()
         $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
         $this->couponResource = $objectManager->get(CouponResourceInterface::class);
         $this->coupon = $objectManager->create(Coupon::class);
-        $this->salesRule = $objectManager->create(Rule::class);
+        $this->ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
+        $this->conditionFactory = $objectManager->get(ConditionInterfaceFactory::class);
     }
 
     /**
@@ -282,37 +290,32 @@ private function excludeProductPerCoupon(string $couponCode, string $sku)
     {
         $this->coupon->loadByCode($couponCode);
         $ruleId = $this->coupon->getRuleId();
-        $salesRule = $this->salesRule->load($ruleId);
-        $salesRule->getConditions()->loadArray([
-            'type' => \Magento\SalesRule\Model\Rule\Condition\Combine::class,
-            'attribute' => null,
-            'operator' => null,
-            'value' => '1',
-            'is_value_processed' => null,
-            'aggregator' => 'all',
-            'conditions' =>
-                [
-                    [
-                        'type' => \Magento\SalesRule\Model\Rule\Condition\Product\Found::class,
-                        'attribute' => null,
-                        'operator' => null,
-                        'value' => '1',
-                        'is_value_processed' => null,
-                        'aggregator' => 'all',
-                        'conditions' =>
-                            [
-                                [
-                                    'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
-                                    'attribute' => 'sku',
-                                    'operator' => '!=',
-                                    'value' => $sku,
-                                    'is_value_processed' => false,
-                                ],
-                            ],
-                    ],
-                ],
-        ]);
-        $this->salesRule->save();
+        $salesRule = $this->ruleRepository->getById($ruleId);
+
+        /** @var ConditionInterface $conditionProductSku */
+        $conditionProductSku = $this->conditionFactory->create();
+        $conditionProductSku->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product::class);
+        $conditionProductSku->setAttributeName('sku');
+        $conditionProductSku->setValue('1');
+        $conditionProductSku->setOperator('!=');
+        $conditionProductSku->setValue($sku);
+
+        /** @var ConditionInterface $conditionProductFound */
+        $conditionProductFound = $this->conditionFactory->create();
+        $conditionProductFound->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product\Found::class);
+        $conditionProductFound->setValue('1');
+        $conditionProductFound->setAggregatorType('all');
+        $conditionProductFound->setConditions([$conditionProductSku]);
+
+        /** @var ConditionInterface $conditionCombine */
+        $conditionCombine = $this->conditionFactory->create();
+        $conditionCombine->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Combine::class);
+        $conditionCombine->setValue('1');
+        $conditionCombine->setAggregatorType('all');
+        $conditionCombine->setConditions([$conditionProductFound]);
+
+        $salesRule->setCondition($conditionCombine);
+        $this->ruleRepository->save($salesRule);
     }
 
     /**

From 2d0eecc3e3cab0bd1bf0f2c70d3ff097711d6304 Mon Sep 17 00:00:00 2001
From: Vitaliy Boyko <v.boyko@atwix.com>
Date: Wed, 3 Apr 2019 15:16:03 +0300
Subject: [PATCH 11/21] graphQl-512: added street lines validation

---
 .../Model/Cart/QuoteAddress/Validator.php     | 45 +++++++++++++
 .../Model/Cart/QuoteAddressFactory.php        | 14 +++-
 .../Customer/CreateCustomerAddressTest.php    | 66 +++++++++++++++++++
 .../Customer/SetBillingAddressOnCartTest.php  | 43 ++++++++++++
 .../Customer/SetShippingAddressOnCartTest.php | 46 +++++++++++++
 .../Guest/SetBillingAddressOnCartTest.php     | 43 ++++++++++++
 .../Guest/SetShippingAddressOnCartTest.php    | 44 +++++++++++++
 7 files changed, 300 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php
new file mode 100644
index 0000000000000..8cf2478d8f8b6
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart\QuoteAddress;
+
+use Magento\Customer\Helper\Address as AddressHelper;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
+
+/**
+ * Validate Quote Address
+ */
+class Validator
+{
+    /**
+     * @var AddressHelper
+     */
+    private $addressHelper;
+
+    /**
+     * @param AddressHelper $addressHelper
+     */
+    public function __construct(AddressHelper $addressHelper)
+    {
+        $this->addressHelper = $addressHelper;
+    }
+
+    /**
+     * Additional Quote Address validation for the GraphQl endpoint
+     *
+     * @param QuoteAddress $quoteAddress
+     * @throws GraphQlInputException
+     */
+    public function validate(QuoteAddress $quoteAddress)
+    {
+        $maxAllowedLineCount = $this->addressHelper->getStreetLines();
+        if (is_array($quoteAddress->getStreet()) && count($quoteAddress->getStreet()) > $maxAllowedLineCount) {
+            throw new GraphQlInputException(__('"Street Address" cannot contain more than %1 lines.', $maxAllowedLineCount));
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
index 76bdc74611131..734843e1be09b 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
@@ -12,6 +12,7 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
 use Magento\Quote\Model\Quote\AddressFactory as BaseQuoteAddressFactory;
+use Magento\QuoteGraphQl\Model\Cart\QuoteAddress\Validator;
 
 /**
  * Create QuoteAddress
@@ -22,14 +23,21 @@ class QuoteAddressFactory
      * @var BaseQuoteAddressFactory
      */
     private $quoteAddressFactory;
+    /**
+     * @var Validator
+     */
+    private $quoteAddressValidator;
 
     /**
      * @param BaseQuoteAddressFactory $quoteAddressFactory
+     * @param Validator $quoteAddressValidator
      */
     public function __construct(
-        BaseQuoteAddressFactory $quoteAddressFactory
+        BaseQuoteAddressFactory $quoteAddressFactory,
+        Validator $quoteAddressValidator
     ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
+        $this->quoteAddressValidator = $quoteAddressValidator;
     }
 
     /**
@@ -44,6 +52,8 @@ public function createBasedOnInputData(array $addressInput): QuoteAddress
 
         $quoteAddress = $this->quoteAddressFactory->create();
         $quoteAddress->addData($addressInput);
+        $this->quoteAddressValidator->validate($quoteAddress);
+
         return $quoteAddress;
     }
 
@@ -62,6 +72,8 @@ public function createBasedOnCustomerAddress(CustomerAddress $customerAddress):
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__($e->getMessage()), $e);
         }
+        $this->quoteAddressValidator->validate($quoteAddress);
+
         return $quoteAddress;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
index 602d969924fbd..4ea19f08e3c1c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
@@ -198,6 +198,72 @@ public function testCreateCustomerAddressWithMissingAttribute()
         $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testCreateCustomerAddressWithRedundantStreetLine()
+    {
+        $newAddress = [
+            'region' => [
+                'region' => 'Arizona',
+                'region_id' => 4,
+                'region_code' => 'AZ'
+            ],
+            'country_id' => 'US',
+            'street' => ['Line 1 Street', 'Line 2', 'Line 3'],
+            'company' => 'Company name',
+            'telephone' => '123456789',
+            'fax' => '123123123',
+            'postcode' => '7777',
+            'city' => 'City Name',
+            'firstname' => 'Adam',
+            'lastname' => 'Phillis',
+            'middlename' => 'A',
+            'prefix' => 'Mr.',
+            'suffix' => 'Jr.',
+            'vat_id' => '1',
+            'default_shipping' => true,
+            'default_billing' => false
+        ];
+
+        $mutation
+            = <<<MUTATION
+mutation {
+  createCustomerAddress(input: {
+    region: {
+        region: "{$newAddress['region']['region']}"
+        region_id: {$newAddress['region']['region_id']}
+        region_code: "{$newAddress['region']['region_code']}"
+    }
+    country_id: {$newAddress['country_id']}
+    street: ["{$newAddress['street'][0]}","{$newAddress['street'][1]}","{$newAddress['street'][2]}"]
+    company: "{$newAddress['company']}"
+    telephone: "{$newAddress['telephone']}"
+    fax: "{$newAddress['fax']}"
+    postcode: "{$newAddress['postcode']}"
+    city: "{$newAddress['city']}"
+    firstname: "{$newAddress['firstname']}"
+    lastname: "{$newAddress['lastname']}"
+    middlename: "{$newAddress['middlename']}"
+    prefix: "{$newAddress['prefix']}"
+    suffix: "{$newAddress['suffix']}"
+    vat_id: "{$newAddress['vat_id']}"
+    default_shipping: true
+    default_billing: false
+  }) {
+    id
+  }
+}
+MUTATION;
+
+        $userName = 'customer@example.com';
+        $password = 'password';
+
+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
+        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
     /**
      * Verify the fields for Customer address
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 88e7b93dd1d08..2ee5bb6708f4c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -493,6 +493,49 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetNewBillingAddressWithRedundantStreetLine()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      billing_address: {
+         address: {
+          firstname: "test firstname"
+          lastname: "test lastname"
+          company: "test company"
+          street: ["test street 1", "test street 2", "test street 3"]
+          city: "test city"
+          region: "test region"
+          postcode: "887766"
+          country_code: "US"
+          telephone: "88776655"
+          save_in_address_book: false
+         }
+      }
+    }
+  ) {
+    cart {
+      billing_address {
+        firstname
+      }
+    }
+  }
+}
+QUERY;
+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
     /**
      * @return array
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index 5ff29d20b34d7..f765851f2372e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -486,6 +486,52 @@ public function testSetMultipleNewShippingAddresses()
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetNewShippingAddressOnCartWithRedundantStreetLine()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2", "test street 3"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        firstname
+      }
+    }
+  }
+}
+QUERY;
+
+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index ae0a1a0e822ac..5fe0ae05903c5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -313,6 +313,49 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetNewBillingAddressRedundantStreetLine()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      billing_address: {
+        address: {
+          firstname: "test firstname"
+          lastname: "test lastname"
+          company: "test company"
+          street: ["test street 1", "test street 2", "test street 3"]
+          city: "test city"
+          region: "test region"
+          postcode: "887766"
+          country_code: "US"
+          telephone: "88776655"
+          save_in_address_book: false
+        }
+      }
+    }
+  ) {
+    cart {
+      billing_address {
+        firstname
+      }
+    }
+  }
+}
+QUERY;
+
+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @return array
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
index e21d9ed64d491..f86b621497200 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -246,6 +246,50 @@ public function testSetNewShippingAddressWithMissedRequiredParameters(string $in
         $this->graphQlQuery($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetNewShippingAddressOnCartWithRedundantStreetLine()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2", "test street 3"]
+            city: "test city"
+            region: "test region"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        firstname
+      }
+    }
+  }
+}
+QUERY;
+        self::expectExceptionMessage('"Street Address" cannot contain more than 2 lines.');
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @return array
      */

From fef452adae8dde46c395afbe02ba6a7b2d88bcc7 Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Fri, 5 Apr 2019 15:05:30 -0500
Subject: [PATCH 12/21] MC-15440: Product Page Gallery Load Optimization

---
 .../Catalog/Block/Product/View/Gallery.php    | 23 ++-----------------
 app/code/Magento/Catalog/Helper/Image.php     |  3 ++-
 .../frontend/layout/catalog_product_view.xml  |  6 ++++-
 .../templates/product/view/gallery.phtml      | 20 +++++++++++++++-
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index fb2898544d804..8b98fbdc8f7ef 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -207,8 +207,8 @@ public function isMainImage($image)
      */
     public function getImageAttribute($imageId, $attributeName, $default = null)
     {
-        $attributes =
-            $this->getConfigView()->getMediaAttributes('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE, $imageId);
+        $attributes = $this->getConfigView()
+                ->getMediaAttributes('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE, $imageId);
         return $attributes[$attributeName] ?? $default;
     }
 
@@ -239,23 +239,4 @@ private function getGalleryImagesConfig()
 
         return $this->getData('gallery_images_config');
     }
-
-    /**
-     * Get main product image
-     *
-     * @param string $size
-     * @return string
-     */
-    public function getMainProductImage($size = 'medium_image_url')
-    {
-        foreach ($this->getGalleryImages() as $image) {
-            $image = $image->getData($size);
-
-            if (!$image) {
-                return $this->_imageHelper->getDefaultPlaceholderUrl('image');
-            }
-
-            return $image;
-        }
-    }
 }
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index 170f1209ad9e6..cc2a1cd7cb481 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Helper;
 
 use Magento\Framework\App\Helper\AbstractHelper;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
 
 /**
  * Catalog image helper
@@ -14,7 +15,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @since 100.0.2
  */
-class Image extends AbstractHelper
+class Image extends AbstractHelper implements ArgumentInterface
 {
     /**
      * Media config node
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
index 8d3248896b434..e987d09728bdb 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
@@ -121,7 +121,11 @@
                         </arguments>
                     </block>
                 </container>
-                <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="Magento_Catalog::product/view/gallery.phtml"/>
+                <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="Magento_Catalog::product/view/gallery.phtml">
+                    <arguments>
+                        <argument name="imageHelper" xsi:type="object">Magento\Catalog\Helper\Image</argument>
+                    </arguments>
+                </block>
                 <container name="skip_gallery_after.wrapper" htmlTag="div" htmlClass="action-skip-wrapper">
                     <block class="Magento\Framework\View\Element\Template" after="product.info.media.image" name="skip_gallery_after" template="Magento_Theme::html/skip.phtml">
                         <arguments>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 820e6cc969175..096761c0a5d5c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -13,10 +13,28 @@
  */
 ?>
 
+<?php
+    $images = $block->getGalleryImages()->getItems();
+    $mainImage = current(array_filter($images, function ($img) use ($block) {
+        return $block->isMainImage($img);
+    }));
+
+    if (!empty($images) && empty($mainImage)) {
+        $mainImage = $block->getGalleryImages()->getFirstItem();
+    }
+
+    $helper = $block->getData('imageHelper');
+    $mainImageData = $mainImage ?
+        $mainImage->getData('medium_image_url') :
+        $helper->getDefaultPlaceholderUrl('image');
+
+?>
+
 <div class="gallery-placeholder _block-content-loading" data-gallery-role="gallery-placeholder">
     <img
+        alt="main product photo"
         class="gallery-placeholder__image"
-        src="<?= /* @escapeNotVerified */ $block->getMainProductImage() ?>"
+        src="<?= /* @noEscape */ $mainImageData ?>"
     />
 </div>
 

From 2131a21f183dfd0019c36f90bb4921948552d045 Mon Sep 17 00:00:00 2001
From: Dmytro Cheshun <mitry@atwix.com>
Date: Sun, 7 Apr 2019 23:00:20 +0300
Subject: [PATCH 13/21] Add API functional tests for ApplyCouponToCart
 functionality, code refactoring

---
 .../Quote/Customer/ApplyCouponToCartTest.php  | 284 +++++-------------
 .../Quote/Guest/ApplyCouponToCartTest.php     | 199 +++---------
 .../Quote/_files/make_coupon_expired.php      |  22 ++
 .../_files/make_coupon_expired_rollback.php   |  23 ++
 ...strict_coupon_usage_for_simple_product.php |  52 ++++
 ...upon_usage_for_simple_product_rollback.php |  37 +++
 6 files changed, 252 insertions(+), 365 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
index 2db2e799f9123..885e8705dc3d9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
@@ -8,15 +8,8 @@
 namespace Magento\GraphQl\Quote\Customer;
 
 use Magento\Framework\Exception\AuthenticationException;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-use Magento\SalesRule\Api\Data\ConditionInterface;
-use Magento\SalesRule\Api\Data\ConditionInterfaceFactory;
-use Magento\SalesRule\Api\RuleRepositoryInterface;
-use Magento\SalesRule\Model\Coupon;
-use Magento\SalesRule\Model\Spi\CouponResourceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -25,279 +18,187 @@
  */
 class ApplyCouponToCartTest extends GraphQlAbstract
 {
-    /**
-     * @var QuoteResource
-     */
-    private $quoteResource;
-
-    /**
-     * @var Quote
-     */
-    private $quote;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @var CouponResourceInterface
-     */
-    protected $couponResource;
-
-    /**
-     * @var Coupon
-     */
-    private $coupon;
-
     /**
      * @var CustomerTokenServiceInterface
      */
     private $customerTokenService;
 
     /**
-     * @var RuleRepositoryInterface
-     */
-    private $ruleRepository;
-
-    /**
-     * @var ConditionInterfaceFactory
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $conditionFactory;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->create(QuoteResource::class);
-        $this->quote = $objectManager->create(Quote::class);
-        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
-        $this->couponResource = $objectManager->get(CouponResourceInterface::class);
-        $this->coupon = $objectManager->create(Coupon::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
-        $this->conditionFactory = $objectManager->get(ConditionInterfaceFactory::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testApplyCouponToCart()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('applyCouponToCart', $response);
         self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
     }
 
     /**
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @expectedException \Exception
      * @expectedExceptionMessage A coupon is already applied to the cart. Please remove it to apply another
      */
     public function testApplyCouponTwice()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $response = $this->graphQlQuery($query, [], '', $queryHeaders);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey("applyCouponToCart", $response);
         self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
 
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @expectedException \Exception
      * @expectedExceptionMessage Cart does not contain products.
      */
     public function testApplyCouponToCartWithoutItems()
     {
         $couponCode = '2?ds5!2d';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException \Exception
      */
     public function testApplyCouponToGuestCart()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @expectedException \Exception
      */
     public function testApplyCouponToAnotherCustomerCart()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(2);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer_two@example.com'));
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @expectedException \Exception
      * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testApplyNonExistentCouponToCart()
     {
-        $couponCode = '1%q#f5';
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $couponCode = 'non_existent_coupon_code';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
      * @expectedException \Exception
      */
     public function testApplyCouponToNonExistentCart()
     {
         $couponCode = '2?ds5!2d';
-        $maskedQuoteId = '1hk3y1842h1n';
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId . '"');
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_coupon_expired.php
      * @expectedException \Exception
      * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testApplyExpiredCoupon()
     {
         $couponCode = '2?ds5!2d';
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->coupon->loadByCode($couponCode);
-        $yesterday = new \DateTime();
-        $yesterday->add(\DateInterval::createFromDateString('-1 day'));
-        $this->coupon->setExpirationDate($yesterday->format('Y-m-d'));
-        $this->couponResource->save($this->coupon);
-
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
      * Products in cart don't fit to the coupon
      *
+     * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
      * @expectedException \Exception
      * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testApplyCouponWhichIsNotApplicable()
     {
         $couponCode = '2?ds5!2d';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $this->excludeProductPerCoupon($couponCode, 'simple');
-
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -305,6 +206,7 @@ public function testApplyCouponWhichIsNotApplicable()
      * @param string $message
      * @dataProvider dataProviderUpdateWithMissedRequiredParameters
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @expectedException \Exception
      */
     public function testApplyCouponWithMissedRequiredParameters(string $input, string $message)
@@ -321,12 +223,8 @@ public function testApplyCouponWithMissedRequiredParameters(string $input, strin
 }
 QUERY;
 
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $queryHeaders = $this->prepareAuthorizationHeaders('customer@example.com', 'password');
-
         $this->expectExceptionMessage($message);
-        $this->graphQlQuery($query, [], '', $queryHeaders);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -346,55 +244,19 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         ];
     }
 
-    /**
-     * @param string $couponCode
-     * @param string $sku
-     * @throws \Exception
-     */
-    private function excludeProductPerCoupon(string $couponCode, string $sku)
-    {
-        $this->coupon->loadByCode($couponCode);
-        $ruleId = $this->coupon->getRuleId();
-        $salesRule = $this->ruleRepository->getById($ruleId);
-
-        /** @var ConditionInterface $conditionProductSku */
-        $conditionProductSku = $this->conditionFactory->create();
-        $conditionProductSku->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product::class);
-        $conditionProductSku->setAttributeName('sku');
-        $conditionProductSku->setValue('1');
-        $conditionProductSku->setOperator('!=');
-        $conditionProductSku->setValue($sku);
-
-        /** @var ConditionInterface $conditionProductFound */
-        $conditionProductFound = $this->conditionFactory->create();
-        $conditionProductFound->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product\Found::class);
-        $conditionProductFound->setValue('1');
-        $conditionProductFound->setAggregatorType('all');
-        $conditionProductFound->setConditions([$conditionProductSku]);
-
-        /** @var ConditionInterface $conditionCombine */
-        $conditionCombine = $this->conditionFactory->create();
-        $conditionCombine->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Combine::class);
-        $conditionCombine->setValue('1');
-        $conditionCombine->setAggregatorType('all');
-        $conditionCombine->setConditions([$conditionProductFound]);
-
-        $salesRule->setCondition($conditionCombine);
-        $this->ruleRepository->save($salesRule);
-    }
-
     /**
      * Retrieve customer authorization headers
      *
-     * @param string $email
+     * @param string $username
      * @param string $password
      * @return array
      * @throws AuthenticationException
      */
-    private function prepareAuthorizationHeaders(string $email, string $password): array
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
     {
-        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
-        return ['Authorization' => 'Bearer ' . $customerToken];
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
     }
 
     /**
@@ -402,7 +264,7 @@ private function prepareAuthorizationHeaders(string $email, string $password): a
      * @param string $couponCode
      * @return string
      */
-    private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string
+    private function getQuery(string $maskedQuoteId, string $couponCode): string
     {
         return <<<QUERY
 mutation {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
index 51644a9fe8c55..4fd1c713db5d4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
@@ -7,14 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-use Magento\SalesRule\Api\Data\ConditionInterface;
-use Magento\SalesRule\Api\Data\ConditionInterfaceFactory;
-use Magento\SalesRule\Api\RuleRepositoryInterface;
-use Magento\SalesRule\Model\Coupon;
-use Magento\SalesRule\Model\Spi\CouponResourceInterface;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -24,67 +17,27 @@
 class ApplyCouponToCartTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
-
-    /**
-     * @var Quote
-     */
-    private $quote;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @var CouponResourceInterface
-     */
-    protected $couponResource;
-
-    /**
-     * @var Coupon
-     */
-    private $coupon;
-
-    /**
-     * @var RuleRepositoryInterface
-     */
-    private $ruleRepository;
-
-    /**
-     * @var ConditionInterfaceFactory
-     */
-    private $conditionFactory;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->create(QuoteResource::class);
-        $this->quote = $objectManager->create(Quote::class);
-        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
-        $this->couponResource = $objectManager->get(CouponResourceInterface::class);
-        $this->coupon = $objectManager->create(Coupon::class);
-        $this->ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
-        $this->conditionFactory = $objectManager->get(ConditionInterfaceFactory::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
      */
     public function testApplyCouponToCart()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('applyCouponToCart', $response);
@@ -92,7 +45,9 @@ public function testApplyCouponToCart()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
      * @expectedException \Exception
      * @expectedExceptionMessage A coupon is already applied to the cart. Please remove it to apply another
@@ -100,14 +55,8 @@ public function testApplyCouponToCart()
     public function testApplyCouponTwice()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey("applyCouponToCart", $response);
@@ -117,7 +66,8 @@ public function testApplyCouponTwice()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
      * @expectedException \Exception
      * @expectedExceptionMessage Cart does not contain products.
@@ -125,53 +75,41 @@ public function testApplyCouponTwice()
     public function testApplyCouponToCartWithoutItems()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * _security
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @expectedException \Exception
      */
     public function testApplyCouponToCustomerCart()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $this->quote->setCustomerId(1);
-        $this->quoteResource->save($this->quote);
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('The current user cannot perform operations on cart "' . $maskedQuoteId . '"');
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @expectedException \Exception
      * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testApplyNonExistentCouponToCart()
     {
-        $couponCode = '1%q#f5';
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $couponCode = 'non_existent_coupon_code';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         $this->graphQlQuery($query);
     }
@@ -183,35 +121,27 @@ public function testApplyNonExistentCouponToCart()
     public function testApplyCouponToNonExistentCart()
     {
         $couponCode = '2?ds5!2d';
-        $maskedQuoteId = '1hk3y1842h1n';
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         self::expectExceptionMessage('Could not find a cart with ID "' . $maskedQuoteId . '"');
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_coupon_expired.php
      * @expectedException \Exception
      * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testApplyExpiredCoupon()
     {
         $couponCode = '2?ds5!2d';
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $this->coupon->loadByCode($couponCode);
-
-        $yesterday = new \DateTime();
-        $yesterday->add(\DateInterval::createFromDateString('-1 day'));
-        $this->coupon->setExpirationDate($yesterday->format('Y-m-d'));
-        $this->couponResource->save($this->coupon);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         $this->graphQlQuery($query);
     }
@@ -219,23 +149,19 @@ public function testApplyExpiredCoupon()
     /**
      * Products in cart don't fit to the coupon
      *
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
      * @expectedException \Exception
      * @expectedExceptionMessage The coupon code isn't valid. Verify the code and try again.
      */
     public function testApplyCouponWhichIsNotApplicable()
     {
         $couponCode = '2?ds5!2d';
-
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_with_simple_product_without_address',
-            'reserved_order_id'
-        );
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
-        $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
-        $this->excludeProductPerCoupon($couponCode, 'simple');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = $this->getQuery($maskedQuoteId, $couponCode);
 
         $this->graphQlQuery($query);
     }
@@ -243,6 +169,8 @@ public function testApplyCouponWhichIsNotApplicable()
     /**
      * @param string $input
      * @param string $message
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @dataProvider dataProviderUpdateWithMissedRequiredParameters
      * @expectedException \Exception
      */
@@ -281,49 +209,12 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         ];
     }
 
-    /**
-     * @param string $couponCode
-     * @param string $sku
-     * @throws \Exception
-     */
-    private function excludeProductPerCoupon(string $couponCode, string $sku)
-    {
-        $this->coupon->loadByCode($couponCode);
-        $ruleId = $this->coupon->getRuleId();
-        $salesRule = $this->ruleRepository->getById($ruleId);
-
-        /** @var ConditionInterface $conditionProductSku */
-        $conditionProductSku = $this->conditionFactory->create();
-        $conditionProductSku->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product::class);
-        $conditionProductSku->setAttributeName('sku');
-        $conditionProductSku->setValue('1');
-        $conditionProductSku->setOperator('!=');
-        $conditionProductSku->setValue($sku);
-
-        /** @var ConditionInterface $conditionProductFound */
-        $conditionProductFound = $this->conditionFactory->create();
-        $conditionProductFound->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product\Found::class);
-        $conditionProductFound->setValue('1');
-        $conditionProductFound->setAggregatorType('all');
-        $conditionProductFound->setConditions([$conditionProductSku]);
-
-        /** @var ConditionInterface $conditionCombine */
-        $conditionCombine = $this->conditionFactory->create();
-        $conditionCombine->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Combine::class);
-        $conditionCombine->setValue('1');
-        $conditionCombine->setAggregatorType('all');
-        $conditionCombine->setConditions([$conditionProductFound]);
-
-        $salesRule->setCondition($conditionCombine);
-        $this->ruleRepository->save($salesRule);
-    }
-
     /**
      * @param string $maskedQuoteId
      * @param string $couponCode
      * @return string
      */
-    private function prepareAddCouponRequestQuery(string $maskedQuoteId, string $couponCode): string
+    private function getQuery(string $maskedQuoteId, string $couponCode): string
     {
         return <<<QUERY
 mutation {
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired.php
new file mode 100644
index 0000000000000..5316b184ecd15
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\SalesRule\Model\CouponFactory;
+use Magento\SalesRule\Model\Spi\CouponResourceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CouponResourceInterface $couponResource */
+$couponResource = Bootstrap::getObjectManager()->get(CouponResourceInterface::class);
+/** @var CouponFactory $couponFactory */
+$couponFactory = Bootstrap::getObjectManager()->get(CouponFactory::class);
+
+$coupon = $couponFactory->create();
+$coupon->loadByCode('2?ds5!2d');
+$yesterday = new \DateTime();
+$yesterday->add(\DateInterval::createFromDateString('-1 day'));
+$coupon->setExpirationDate($yesterday->format('Y-m-d'));
+$couponResource->save($coupon);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired_rollback.php
new file mode 100644
index 0000000000000..32c3d78bafd09
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/make_coupon_expired_rollback.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\SalesRule\Model\CouponFactory;
+use Magento\SalesRule\Model\Spi\CouponResourceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CouponResourceInterface $couponResource */
+$couponResource = Bootstrap::getObjectManager()->get(CouponResourceInterface::class);
+/** @var CouponFactory $couponFactory */
+$couponFactory = Bootstrap::getObjectManager()->get(CouponFactory::class);
+
+$coupon = $couponFactory->create();
+$coupon->loadByCode('2?ds5!2d');
+
+if ($coupon->getId()) {
+    $coupon->setExpirationDate(null);
+    $couponResource->save($coupon);
+}
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
new file mode 100644
index 0000000000000..e58c6b21d8d23
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\SalesRule\Api\Data\ConditionInterface;
+use Magento\SalesRule\Api\Data\ConditionInterfaceFactory;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
+use Magento\SalesRule\Model\CouponFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CouponFactory $couponFactory */
+$couponFactory = Bootstrap::getObjectManager()->get(CouponFactory::class);
+/** @var ConditionInterfaceFactory $conditionFactory */
+$conditionFactory = Bootstrap::getObjectManager()->get(ConditionInterfaceFactory::class);
+/** @var RuleRepositoryInterface $ruleRepository */
+$ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class);
+
+$couponCode = '2?ds5!2d';
+$sku = 'simple_product';
+
+$coupon = $couponFactory->create();
+$coupon->loadByCode($couponCode);
+$ruleId = $coupon->getRuleId();
+$salesRule = $ruleRepository->getById($ruleId);
+
+/** @var ConditionInterface $conditionProductSku */
+$conditionProductSku = $conditionFactory->create();
+$conditionProductSku->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product::class);
+$conditionProductSku->setAttributeName('sku');
+$conditionProductSku->setValue('1');
+$conditionProductSku->setOperator('!=');
+$conditionProductSku->setValue($sku);
+
+/** @var ConditionInterface $conditionProductFound */
+$conditionProductFound = $conditionFactory->create();
+$conditionProductFound->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Product\Found::class);
+$conditionProductFound->setValue('1');
+$conditionProductFound->setAggregatorType('all');
+$conditionProductFound->setConditions([$conditionProductSku]);
+
+/** @var ConditionInterface $conditionCombine */
+$conditionCombine = $conditionFactory->create();
+$conditionCombine->setConditionType(\Magento\SalesRule\Model\Rule\Condition\Combine::class);
+$conditionCombine->setValue('1');
+$conditionCombine->setAggregatorType('all');
+$conditionCombine->setConditions([$conditionProductFound]);
+
+$salesRule->setCondition($conditionCombine);
+$ruleRepository->save($salesRule);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product_rollback.php
new file mode 100644
index 0000000000000..86ab253f1d3c0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/restrict_coupon_usage_for_simple_product_rollback.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\SalesRule\Api\Data\ConditionInterface;
+use Magento\SalesRule\Api\Data\ConditionInterfaceFactory;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
+use Magento\SalesRule\Model\CouponFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CouponFactory $couponFactory */
+$couponFactory = Bootstrap::getObjectManager()->get(CouponFactory::class);
+/** @var ConditionInterfaceFactory $conditionFactory */
+$conditionFactory = Bootstrap::getObjectManager()->get(ConditionInterfaceFactory::class);
+/** @var RuleRepositoryInterface $ruleRepository */
+$ruleRepository = Bootstrap::getObjectManager()->get(RuleRepositoryInterface::class);
+
+$couponCode = '2?ds5!2d';
+$sku = 'simple_product';
+
+$coupon = $couponFactory->create();
+$coupon->loadByCode($couponCode);
+
+if ($coupon->getId()) {
+    $ruleId = $coupon->getRuleId();
+    $salesRule = $ruleRepository->getById($ruleId);
+
+    /** @var ConditionInterface $conditionCombine */
+    $conditionCombine = $conditionFactory->create();
+    $conditionCombine->setConditions([]);
+
+    $salesRule->setCondition($conditionCombine);
+    $ruleRepository->save($salesRule);
+}

From c7a770fa1efb6fb966f2ee1342fadb4c496f880f Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Mon, 8 Apr 2019 10:26:38 -0500
Subject: [PATCH 14/21] MC-15440: Product Page Gallery Load Optimization

---
 app/code/Magento/Catalog/Helper/Image.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index cc2a1cd7cb481..9b8d0ad75a8c9 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -765,7 +765,7 @@ protected function getImageFile()
     protected function parseSize($string)
     {
         $size = explode('x', strtolower($string));
-        if (sizeof($size) == 2) {
+        if (count($size) == 2) {
             return ['width' => $size[0] > 0 ? $size[0] : null, 'height' => $size[1] > 0 ? $size[1] : null];
         }
         return false;

From 3352abdc715ef0446684d4e866da1d72e56d4fc5 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 8 Apr 2019 11:19:40 -0500
Subject: [PATCH 15/21] GraphQL-544: Replace deprecated fixtures in
 RemoveItemFromCartTest

---
 .../Quote/Customer/RemoveItemFromCartTest.php | 209 +++++++-----------
 .../GetQuoteItemIdByReservedQuoteIdAndSku.php |  66 ++++++
 .../Quote/Guest/RemoveItemFromCartTest.php    | 143 ++++++------
 3 files changed, 212 insertions(+), 206 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteItemIdByReservedQuoteIdAndSku.php

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
index 5f023086e89e1..1b6d1f3b14383 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
@@ -7,11 +7,9 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
-use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\GraphQl\Quote\GetQuoteItemIdByReservedQuoteIdAndSku;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -26,49 +24,37 @@ class RemoveItemFromCartTest extends GraphQlAbstract
     private $customerTokenService;
 
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
-     * @var QuoteFactory
+     * @var GetQuoteItemIdByReservedQuoteIdAndSku
      */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private $productRepository;
+    private $getQuoteItemIdByReservedQuoteIdAndSku;
 
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->getQuoteItemIdByReservedQuoteIdAndSku = $objectManager->get(
+            GetQuoteItemIdByReservedQuoteIdAndSku::class
+        );
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testRemoveItemFromCart()
     {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-        $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $itemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $itemId);
+        $query = $this->getQuery($maskedQuoteId, $itemId);
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         $this->assertArrayHasKey('removeItemFromCart', $response);
@@ -83,116 +69,24 @@ public function testRemoveItemFromCart()
      */
     public function testRemoveItemFromNonExistentCart()
     {
-        $query = $this->prepareMutationQuery('non_existent_masked_id', 1);
+        $query = $this->getQuery('non_existent_masked_id', 1);
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testRemoveNonExistentItem()
     {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_quote', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $notExistentItemId = 999;
 
         $this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $notExistentItemId);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
-     */
-    public function testRemoveItemIfItemIsNotBelongToCart()
-    {
-        $firstQuote = $this->quoteFactory->create();
-        $this->quoteResource->load($firstQuote, 'test_quote', 'reserved_order_id');
-        $firstQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$firstQuote->getId());
-
-        $secondQuote = $this->quoteFactory->create();
-        $this->quoteResource->load(
-            $secondQuote,
-            'test_order_with_virtual_product_without_address',
-            'reserved_order_id'
-        );
-        $secondQuote->setCustomerId(1);
-        $this->quoteResource->save($secondQuote);
-        $secondQuoteItemId = (int)$secondQuote
-            ->getItemByProduct($this->productRepository->get('virtual-product'))
-            ->getId();
-
-        $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
-
-        $query = $this->prepareMutationQuery($firstQuoteMaskedId, $secondQuoteItemId);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_virtual.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_virtual_product.php
-     */
-    public function testRemoveItemFromGuestCart()
-    {
-        $guestQuote = $this->quoteFactory->create();
-        $this->quoteResource->load(
-            $guestQuote,
-            'test_quote',
-            'reserved_order_id'
-        );
-        $guestQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$guestQuote->getId());
-        $guestQuoteItemId = (int)$guestQuote
-            ->getItemByProduct($this->productRepository->get('virtual-product'))
-            ->getId();
-
-        $this->expectExceptionMessage(
-            "The current user cannot perform operations on cart \"$guestQuoteMaskedId\""
-        );
-
-        $query = $this->prepareMutationQuery($guestQuoteMaskedId, $guestQuoteItemId);
-        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
-     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
-     */
-    public function testRemoveItemFromAnotherCustomerCart()
-    {
-        $anotherCustomerQuote = $this->quoteFactory->create();
-        $this->quoteResource->load(
-            $anotherCustomerQuote,
-            'test_order_with_virtual_product_without_address',
-            'reserved_order_id'
-        );
-        $anotherCustomerQuote->setCustomerId(2);
-        $this->quoteResource->save($anotherCustomerQuote);
-
-        $anotherCustomerQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$anotherCustomerQuote->getId());
-        $anotherCustomerQuoteItemId = (int)$anotherCustomerQuote
-            ->getItemByProduct($this->productRepository->get('virtual-product'))
-            ->getId();
-
-        $this->expectExceptionMessage(
-            "The current user cannot perform operations on cart \"$anotherCustomerQuoteMaskedId\""
-        );
-
-        $query = $this->prepareMutationQuery($anotherCustomerQuoteMaskedId, $anotherCustomerQuoteItemId);
+        $query = $this->getQuery($maskedQuoteId, $notExistentItemId);
         $this->graphQlQuery($query, [], '', $this->getHeaderMap());
     }
 
@@ -240,12 +134,77 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         ];
     }
 
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+     */
+    public function testRemoveItemIfItemIsNotBelongToCart()
+    {
+        $firstQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $secondQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute(
+            'test_order_with_virtual_product',
+            'virtual-product'
+        );
+
+        $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
+
+        $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testRemoveItemFromGuestCart()
+    {
+        $guestQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $guestQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$guestQuoteMaskedId\""
+        );
+
+        $query = $this->getQuery($guestQuoteMaskedId, $guestQuoteItemId);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/three_customers.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testRemoveItemFromAnotherCustomerCart()
+    {
+        $anotherCustomerQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $anotherCustomerQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute(
+            'test_quote',
+            'simple_product'
+        );
+
+        $this->expectExceptionMessage(
+            "The current user cannot perform operations on cart \"$anotherCustomerQuoteMaskedId\""
+        );
+
+        $query = $this->getQuery($anotherCustomerQuoteMaskedId, $anotherCustomerQuoteItemId);
+        $this->graphQlQuery($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param int $itemId
      * @return string
      */
-    private function prepareMutationQuery(string $maskedQuoteId, int $itemId): string
+    private function getQuery(string $maskedQuoteId, int $itemId): string
     {
         return <<<QUERY
 mutation {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteItemIdByReservedQuoteIdAndSku.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteItemIdByReservedQuoteIdAndSku.php
new file mode 100644
index 0000000000000..6f027babc0e27
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetQuoteItemIdByReservedQuoteIdAndSku.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\Quote\Model\QuoteFactory;
+
+/**
+ * Get quote item id by reserved order id and product sku
+ */
+class GetQuoteItemIdByReservedQuoteIdAndSku
+{
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @param QuoteFactory $quoteFactory
+     * @param QuoteResource $quoteResource
+     * @param ProductRepositoryInterface $productRepository
+     */
+    public function __construct(
+        QuoteFactory $quoteFactory,
+        QuoteResource $quoteResource,
+        ProductRepositoryInterface $productRepository
+    ) {
+        $this->quoteFactory = $quoteFactory;
+        $this->quoteResource = $quoteResource;
+        $this->productRepository = $productRepository;
+    }
+
+    /**
+     * Get quote item id by reserved order id and product sku
+     *
+     * @param string $reservedOrderId
+     * @param string $sku
+     * @return int
+     * @throws NoSuchEntityException
+     */
+    public function execute(string $reservedOrderId, string $sku): int
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
+        $product = $this->productRepository->get($sku);
+
+        return (int)$quote->getItemByProduct($product)->getId();
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
index a306b29e51197..294230c658aa0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
@@ -7,10 +7,8 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Magento\Quote\Model\QuoteFactory;
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\GraphQl\Quote\GetQuoteItemIdByReservedQuoteIdAndSku;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -20,45 +18,35 @@
 class RemoveItemFromCartTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
+     * @var GetMaskedQuoteIdByReservedOrderId
      */
-    private $quoteResource;
+    private $getMaskedQuoteIdByReservedOrderId;
 
     /**
-     * @var QuoteFactory
+     * @var GetQuoteItemIdByReservedQuoteIdAndSku
      */
-    private $quoteFactory;
-
-    /**
-     * @var QuoteIdToMaskedQuoteIdInterface
-     */
-    private $quoteIdToMaskedId;
-
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private $productRepository;
+    private $getQuoteItemIdByReservedQuoteIdAndSku;
 
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
-        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
-        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->getQuoteItemIdByReservedQuoteIdAndSku = $objectManager->get(
+            GetQuoteItemIdByReservedQuoteIdAndSku::class
+        );
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testRemoveItemFromCart()
     {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
-        $itemId = (int)$quote->getItemByProduct($this->productRepository->get('simple'))->getId();
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $itemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $itemId);
+        $query = $this->getQuery($maskedQuoteId, $itemId);
         $response = $this->graphQlQuery($query);
 
         $this->assertArrayHasKey('removeItemFromCart', $response);
@@ -72,69 +60,23 @@ public function testRemoveItemFromCart()
      */
     public function testRemoveItemFromNonExistentCart()
     {
-        $query = $this->prepareMutationQuery('non_existent_masked_id', 1);
+        $query = $this->getQuery('non_existent_masked_id', 1);
         $this->graphQlQuery($query);
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
     public function testRemoveNonExistentItem()
     {
-        $quote = $this->quoteFactory->create();
-        $this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $notExistentItemId = 999;
 
         $this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
 
-        $query = $this->prepareMutationQuery($maskedQuoteId, $notExistentItemId);
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * Test mutation is only able to remove quote item belonging to the requested cart
-     *
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
-     */
-    public function testRemoveItemIfItemIsNotBelongToCart()
-    {
-        $firstQuote = $this->quoteFactory->create();
-        $this->quoteResource->load($firstQuote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
-        $firstQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$firstQuote->getId());
-
-        $secondQuote = $this->quoteFactory->create();
-        $this->quoteResource->load(
-            $secondQuote,
-            'test_order_with_virtual_product_without_address',
-            'reserved_order_id'
-        );
-        $secondQuoteItemId = (int)$secondQuote
-            ->getItemByProduct($this->productRepository->get('virtual-product'))
-            ->getId();
-
-        $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
-
-        $query = $this->prepareMutationQuery($firstQuoteMaskedId, $secondQuoteItemId);
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * Test mutation is only able to remove quote item belonging to the requested cart
-     *
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
-     */
-    public function testRemoveItemFromCustomerCart()
-    {
-        $customerQuote = $this->quoteFactory->create();
-        $this->quoteResource->load($customerQuote, 'test_order_1', 'reserved_order_id');
-        $customerQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$customerQuote->getId());
-        $customerQuoteItemId = (int)$customerQuote->getItemByProduct($this->productRepository->get('simple'))->getId();
-
-        $this->expectExceptionMessage("The current user cannot perform operations on cart \"$customerQuoteMaskedId\"");
-
-        $query = $this->prepareMutationQuery($customerQuoteMaskedId, $customerQuoteItemId);
+        $query = $this->getQuery($maskedQuoteId, $notExistentItemId);
         $this->graphQlQuery($query);
     }
 
@@ -181,12 +123,51 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         ];
     }
 
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     */
+    public function testRemoveItemIfItemIsNotBelongToCart()
+    {
+        $firstQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $secondQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute(
+            'test_order_with_virtual_product_without_address',
+            'virtual-product'
+        );
+
+        $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
+
+        $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId);
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * _security
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testRemoveItemFromCustomerCart()
+    {
+        $customerQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $customerQuoteItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
+
+        $this->expectExceptionMessage("The current user cannot perform operations on cart \"$customerQuoteMaskedId\"");
+
+        $query = $this->getQuery($customerQuoteMaskedId, $customerQuoteItemId);
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param int $itemId
      * @return string
      */
-    private function prepareMutationQuery(string $maskedQuoteId, int $itemId): string
+    private function getQuery(string $maskedQuoteId, int $itemId): string
     {
         return <<<QUERY
 mutation {

From fd0ebf8c075d13ec72385c3bc7b7860146af3a07 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 8 Apr 2019 13:05:06 -0500
Subject: [PATCH 16/21] GraphQL-479: [Test Coverage] 'ApplyCouponToCart'
 functionality

---
 .../Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
index 885e8705dc3d9..486f7cd0c27a7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
@@ -110,6 +110,7 @@ public function testApplyCouponToGuestCart()
     }
 
     /**
+     * _security
      * @magentoApiDataFixture Magento/Checkout/_files/discount_10percent_generalusers.php
      * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php

From c11b10bbfeccd8f142cec31495d944bd7f94b9c5 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 8 Apr 2019 13:31:29 -0500
Subject: [PATCH 17/21] GraphQL-512: 'address.street' needs refactoring to
 support as many lines as defined by admin

---
 .../Model/Cart/QuoteAddress/Validator.php     | 45 -------------------
 .../Model/Cart/QuoteAddressFactory.php        | 19 +++++++-
 .../Customer/SetBillingAddressOnCartTest.php  |  2 +-
 .../Customer/SetShippingAddressOnCartTest.php |  2 +-
 .../Guest/SetBillingAddressOnCartTest.php     |  2 +-
 .../Guest/SetShippingAddressOnCartTest.php    |  2 +-
 6 files changed, 22 insertions(+), 50 deletions(-)
 delete mode 100644 app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php
deleted file mode 100644
index 8cf2478d8f8b6..0000000000000
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddress/Validator.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\QuoteGraphQl\Model\Cart\QuoteAddress;
-
-use Magento\Customer\Helper\Address as AddressHelper;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Quote\Model\Quote\Address as QuoteAddress;
-
-/**
- * Validate Quote Address
- */
-class Validator
-{
-    /**
-     * @var AddressHelper
-     */
-    private $addressHelper;
-
-    /**
-     * @param AddressHelper $addressHelper
-     */
-    public function __construct(AddressHelper $addressHelper)
-    {
-        $this->addressHelper = $addressHelper;
-    }
-
-    /**
-     * Additional Quote Address validation for the GraphQl endpoint
-     *
-     * @param QuoteAddress $quoteAddress
-     * @throws GraphQlInputException
-     */
-    public function validate(QuoteAddress $quoteAddress)
-    {
-        $maxAllowedLineCount = $this->addressHelper->getStreetLines();
-        if (is_array($quoteAddress->getStreet()) && count($quoteAddress->getStreet()) > $maxAllowedLineCount) {
-            throw new GraphQlInputException(__('"Street Address" cannot contain more than %1 lines.', $maxAllowedLineCount));
-        }
-    }
-}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
index 582055bc6e13d..13d6a1d3dce70 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
@@ -7,6 +7,7 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
+use Magento\Customer\Helper\Address as AddressHelper;
 use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
@@ -30,16 +31,24 @@ class QuoteAddressFactory
      */
     private $getCustomerAddress;
 
+    /**
+     * @var AddressHelper
+     */
+    private $addressHelper;
+
     /**
      * @param BaseQuoteAddressFactory $quoteAddressFactory
      * @param GetCustomerAddress $getCustomerAddress
+     * @param AddressHelper $addressHelper
      */
     public function __construct(
         BaseQuoteAddressFactory $quoteAddressFactory,
-        GetCustomerAddress $getCustomerAddress
+        GetCustomerAddress $getCustomerAddress,
+        AddressHelper $addressHelper
     ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
         $this->getCustomerAddress = $getCustomerAddress;
+        $this->addressHelper = $addressHelper;
     }
 
     /**
@@ -47,11 +56,19 @@ public function __construct(
      *
      * @param array $addressInput
      * @return QuoteAddress
+     * @throws GraphQlInputException
      */
     public function createBasedOnInputData(array $addressInput): QuoteAddress
     {
         $addressInput['country_id'] = $addressInput['country_code'] ?? '';
 
+        $maxAllowedLineCount = $this->addressHelper->getStreetLines();
+        if (is_array($addressInput['street']) && count($addressInput['street']) > $maxAllowedLineCount) {
+            throw new GraphQlInputException(
+                __('"Street Address" cannot contain more than %1 lines.', $maxAllowedLineCount)
+            );
+        }
+
         $quoteAddress = $this->quoteAddressFactory->create();
         $quoteAddress->addData($addressInput);
         return $quoteAddress;
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index f5bc6276b10e8..b7b6fb5851666 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -495,7 +495,7 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index f731ff5b89db2..0756ba6aeaf22 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -488,7 +488,7 @@ public function testSetMultipleNewShippingAddresses()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index 421dbeb813a4c..d253b6f39b0db 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -314,7 +314,7 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
index 38a835ba89232..a6981e11799fb 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -247,7 +247,7 @@ public function testSetNewShippingAddressWithMissedRequiredParameters(string $in
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      */

From c4acbfffb4f4b9b201a9f1488160e6442affda24 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 8 Apr 2019 14:14:48 -0500
Subject: [PATCH 18/21] GraphQL-470: Creating/getting Cart queries should
 support Store context

---
 .../Model/Cart/GetCartForUser.php             |   2 +-
 .../Quote/Customer/CreateEmptyCartTest.php    | 118 ++++++++++++------
 .../Quote/Guest/CreateEmptyCartTest.php       |  85 ++++++++++---
 3 files changed, 150 insertions(+), 55 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
index ea86dca06271a..3506ffc8c8792 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -85,7 +85,7 @@ public function execute(string $cartHash, ?int $customerId): Quote
         }
 
         if ((int)$cart->getStoreId() !== (int)$this->storeManager->getStore()->getId()) {
-            throw new GraphQlAuthorizationException(
+            throw new GraphQlNoSuchEntityException(
                 __(
                     'Wrong store code specified for cart "%masked_cart_id"',
                     ['masked_cart_id' => $cartHash]
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
index 7539945456530..86b0d3010c0e3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CreateEmptyCartTest.php
@@ -7,8 +7,11 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Quote\Api\GuestCartRepositoryInterface;
@@ -29,16 +32,39 @@ class CreateEmptyCartTest extends GraphQlAbstract
     private $customerTokenService;
 
     /**
-     * @var ResourceConnection
+     * @var QuoteResource
      */
-    private $resourceConnection;
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var MaskedQuoteIdToQuoteIdInterface
+     */
+    private $maskedQuoteIdToQuoteId;
+
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private $quoteIdMaskFactory;
+
+    /**
+     * @var string
+     */
+    private $maskedQuoteId;
 
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->guestCartRepository = $objectManager->get(GuestCartRepositoryInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->resourceConnection = $objectManager->get(ResourceConnection::class);
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->maskedQuoteIdToQuoteId = $objectManager->get(MaskedQuoteIdToQuoteIdInterface::class);
+        $this->quoteIdMaskFactory = $objectManager->get(QuoteIdMaskFactory::class);
     }
 
     /**
@@ -46,27 +72,18 @@ protected function setUp()
      */
     public function testCreateEmptyCart()
     {
-        $query = <<<QUERY
-mutation {
-  createEmptyCart
-}
-QUERY;
-
-        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-
-        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $query = $this->getQuery();
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMapWithCustomerToken());
 
         self::assertArrayHasKey('createEmptyCart', $response);
+        self::assertNotEmpty($response['createEmptyCart']);
 
-        $maskedCartId = $response['createEmptyCart'];
-        $guestCart = $this->guestCartRepository->get($maskedCartId);
+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
+        $this->maskedQuoteId = $response['createEmptyCart'];
 
         self::assertNotNull($guestCart->getId());
         self::assertEquals(1, $guestCart->getCustomer()->getId());
-        self::assertSame('default', $guestCart->getStore()->getCode());
-
-        $this->deleteCreatedQuote($guestCart->getId());
+        self::assertEquals('default', $guestCart->getStore()->getCode());
     }
 
     /**
@@ -75,40 +92,63 @@ public function testCreateEmptyCart()
      */
     public function testCreateEmptyCartWithNotDefaultStore()
     {
-        $query = <<<QUERY
-mutation {
-  createEmptyCart
-}
-QUERY;
-
-        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken, 'Store' => 'fixture_second_store'];
+        $query = $this->getQuery();
 
+        $headerMap = $this->getHeaderMapWithCustomerToken();
+        $headerMap['Store'] = 'fixture_second_store';
         $response = $this->graphQlQuery($query, [], '', $headerMap);
 
         self::assertArrayHasKey('createEmptyCart', $response);
+        self::assertNotEmpty($response['createEmptyCart']);
 
-        $maskedCartId = $response['createEmptyCart'];
         /* guestCartRepository is used for registered customer to get the cart hash */
-        $guestCart = $this->guestCartRepository->get($maskedCartId);
+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
+        $this->maskedQuoteId = $response['createEmptyCart'];
 
         self::assertNotNull($guestCart->getId());
         self::assertEquals(1, $guestCart->getCustomer()->getId());
-        self::assertSame('fixture_second_store', $guestCart->getStore()->getCode());
+        self::assertEquals('fixture_second_store', $guestCart->getStore()->getCode());
+    }
 
-        $this->deleteCreatedQuote($guestCart->getId());
+    /**
+     * @return string
+     */
+    private function getQuery(): string
+    {
+        return <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
     }
 
     /**
-     * Delete active quote for customer by customer id.
-     * This is needed to have ability to create new quote for another store and not return the active one.
-     * @see QuoteManagement::createCustomerCart
-     *
-     * @param $quoteId
+     * @param string $username
+     * @param string $password
+     * @return array
      */
-    private function deleteCreatedQuote($quoteId)
+    private function getHeaderMapWithCustomerToken(
+        string $username = 'customer@example.com',
+        string $password = 'password'
+    ): array {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+
+    public function tearDown()
     {
-        $connection = $this->resourceConnection->getConnection();
-        $connection->query('DELETE FROM quote WHERE entity_id = ' . $quoteId);
+        if (null !== $this->maskedQuoteId) {
+            $quoteId = $this->maskedQuoteIdToQuoteId->execute($this->maskedQuoteId);
+
+            $quote = $this->quoteFactory->create();
+            $this->quoteResource->load($quote, $quoteId);
+            $this->quoteResource->delete($quote);
+
+            $quoteIdMask = $this->quoteIdMaskFactory->create();
+            $quoteIdMask->setQuoteId($quoteId)
+                ->delete();
+        }
+        parent::tearDown();
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
index b283e7ef721a8..fe46a1edcdf1a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CreateEmptyCartTest.php
@@ -7,6 +7,10 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Quote\Api\GuestCartRepositoryInterface;
@@ -21,28 +25,55 @@ class CreateEmptyCartTest extends GraphQlAbstract
      */
     private $guestCartRepository;
 
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var MaskedQuoteIdToQuoteIdInterface
+     */
+    private $maskedQuoteIdToQuoteId;
+
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private $quoteIdMaskFactory;
+
+    /**
+     * @var string
+     */
+    private $maskedQuoteId;
+
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->guestCartRepository = $objectManager->get(GuestCartRepositoryInterface::class);
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->maskedQuoteIdToQuoteId = $objectManager->get(MaskedQuoteIdToQuoteIdInterface::class);
+        $this->quoteIdMaskFactory = $objectManager->get(QuoteIdMaskFactory::class);
     }
 
     public function testCreateEmptyCart()
     {
-        $query = <<<QUERY
-mutation {
-  createEmptyCart
-}
-QUERY;
+        $query = $this->getQuery();
         $response = $this->graphQlQuery($query);
 
         self::assertArrayHasKey('createEmptyCart', $response);
+        self::assertNotEmpty($response['createEmptyCart']);
 
-        $maskedCartId = $response['createEmptyCart'];
-        $guestCart = $this->guestCartRepository->get($maskedCartId);
+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
+        $this->maskedQuoteId = $response['createEmptyCart'];
 
         self::assertNotNull($guestCart->getId());
         self::assertNull($guestCart->getCustomer()->getId());
+        self::assertEquals('default', $guestCart->getStore()->getCode());
     }
 
     /**
@@ -50,22 +81,46 @@ public function testCreateEmptyCart()
      */
     public function testCreateEmptyCartWithNotDefaultStore()
     {
-        $query = <<<QUERY
-mutation {
-  createEmptyCart
-}
-QUERY;
+        $query = $this->getQuery();
         $headerMap = ['Store' => 'fixture_second_store'];
-
         $response = $this->graphQlQuery($query, [], '', $headerMap);
 
         self::assertArrayHasKey('createEmptyCart', $response);
+        self::assertNotEmpty($response['createEmptyCart']);
 
-        $maskedCartId = $response['createEmptyCart'];
-        $guestCart = $this->guestCartRepository->get($maskedCartId);
+        $guestCart = $this->guestCartRepository->get($response['createEmptyCart']);
+        $this->maskedQuoteId = $response['createEmptyCart'];
 
         self::assertNotNull($guestCart->getId());
         self::assertNull($guestCart->getCustomer()->getId());
         self::assertSame('fixture_second_store', $guestCart->getStore()->getCode());
     }
+
+    /**
+     * @return string
+     */
+    private function getQuery(): string
+    {
+        return <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
+    }
+
+    public function tearDown()
+    {
+        if (null !== $this->maskedQuoteId) {
+            $quoteId = $this->maskedQuoteIdToQuoteId->execute($this->maskedQuoteId);
+
+            $quote = $this->quoteFactory->create();
+            $this->quoteResource->load($quote, $quoteId);
+            $this->quoteResource->delete($quote);
+
+            $quoteIdMask = $this->quoteIdMaskFactory->create();
+            $quoteIdMask->setQuoteId($quoteId)
+                ->delete();
+        }
+        parent::tearDown();
+    }
 }

From 722afe3c9fe5c44783a54ae1b9d7feac33542d07 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 8 Apr 2019 15:08:33 -0500
Subject: [PATCH 19/21] GraphQL-512: 'address.street' needs refactoring to
 support as many lines as defined by admin

---
 .../Magento/GraphQl/Customer/CreateCustomerAddressTest.php     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
index 4ea19f08e3c1c..264a2c7de4783 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
@@ -13,6 +13,9 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 
+/**
+ * Create customer address tests
+ */
 class CreateCustomerAddressTest extends GraphQlAbstract
 {
     /**

From 9a4ff36ec163899b781efa6e52033ea1902dc166 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 8 Apr 2019 17:07:12 -0500
Subject: [PATCH 20/21] GraphQL-470: Creating/getting Cart queries should
 support Store context

---
 .../Magento/GraphQl/Quote/Customer/GetCartTest.php   | 12 ++++++------
 .../Magento/GraphQl/Quote/Guest/GetCartTest.php      | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

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
index 8201c60144b15..19b72b9e3ca4c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -129,8 +129,8 @@ public function testGetInactiveCart()
      */
     public function testGetCartWithNotDefaultStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store');
+        $query = $this->getQuery($maskedQuoteId);
 
         $headerMap = $this->getHeaderMap();
         $headerMap['Store'] = 'fixture_second_store';
@@ -150,8 +150,8 @@ public function testGetCartWithNotDefaultStore()
      */
     public function testGetCartWithWrongStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $query = $this->getQuery($maskedQuoteId);
 
         $headerMap = $this->getHeaderMap();
         $headerMap['Store'] = 'fixture_second_store';
@@ -167,8 +167,8 @@ public function testGetCartWithWrongStore()
      */
     public function testGetCartWithNotExistingStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store');
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store');
+        $query = $this->getQuery($maskedQuoteId);
 
         $headerMap = $this->getHeaderMap();
         $headerMap['Store'] = 'not_existing_store';
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index 2b2ea4179ed02..832e15058a4ee 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -102,8 +102,8 @@ public function testGetInactiveCart()
      */
     public function testGetCartWithNotDefaultStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store_guest');
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store_guest');
+        $query = $this->getQuery($maskedQuoteId);
 
         $headerMap = ['Store' => 'fixture_second_store'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -121,8 +121,8 @@ public function testGetCartWithNotDefaultStore()
      */
     public function testGetCartWithWrongStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
-        $query = $this->getCartQuery($maskedQuoteId);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $query = $this->getQuery($maskedQuoteId);
 
         $headerMap = ['Store' => 'fixture_second_store'];
         $this->graphQlQuery($query, [], '', $headerMap);
@@ -137,10 +137,10 @@ public function testGetCartWithWrongStore()
      */
     public function testGetCartWithNotExistingStore()
     {
-        $maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_not_default_store_guest');
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store_guest');
 
         $headerMap['Store'] = 'not_existing_store';
-        $query = $this->getCartQuery($maskedQuoteId);
+        $query = $this->getQuery($maskedQuoteId);
 
         $this->graphQlQuery($query, [], '', $headerMap);
     }

From 3f0530a6d408a2978397550570c2cffe5c5786ce Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 9 Apr 2019 00:22:07 -0500
Subject: [PATCH 21/21] GraphQL-479: [Test Coverage] 'ApplyCouponToCart'
 functionality

---
 .../Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php     | 1 +
 .../Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
index 486f7cd0c27a7..f0d9400b1866b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
@@ -174,6 +174,7 @@ public function testApplyCouponToNonExistentCart()
      */
     public function testApplyExpiredCoupon()
     {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/574');
         $couponCode = '2?ds5!2d';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
index 4fd1c713db5d4..045a28834e0dd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
@@ -139,6 +139,7 @@ public function testApplyCouponToNonExistentCart()
      */
     public function testApplyExpiredCoupon()
     {
+        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/574');
         $couponCode = '2?ds5!2d';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);