Merge branch 'graphql-issue-230' of github.com:magento-honey-badgers/magento2ce into graphql-issue-230

Author: cpartica

dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/CacheTagTest.php

@@ -17,7 +17,6 @@
  */
 class CacheTagTest extends GraphQlAbstract
 {
-
     /**
      * @inheritdoc
      */
@@ -87,7 +86,6 @@ public function testCacheTagForCategoriesWithProduct()
         $firstProductSku = 'simple333';
         $secondProductSku = 'simple444';
         $categoryId ='4';
-
         $variables =[
             'id' => $categoryId,
             'pageSize'=> 10,
@@ -118,22 +116,22 @@ public function testCacheTagForCategoriesWithProduct()
                              ];
         $this->assertEquals($expectedCacheTags, $actualCacheTags);
 
-        // Cach-debug header should be a MISS for product 1 on first request
+        // Cache-debug header should be a MISS for product 1 on first request
         $responseHeadersFirstProduct = $this->graphQlQueryForHttpHeaders($product1Query);
         $this->assertContains('X-Magento-Cache-Debug: MISS', $responseHeadersFirstProduct);
 
-        // Cach-debug header should be a MISS for product 2 during first load
+        // Cache-debug header should be a MISS for product 2 during first load
         $responseHeadersSecondProduct = $this->graphQlQueryForHttpHeaders($product2Query);
         $this->assertContains('X-Magento-Cache-Debug: MISS', $responseHeadersSecondProduct);
 
-        /** cache-debug header value should be MISS after  updating product1 and reloading the Category */
+        /** Cache-debug header value should be MISS after  updating product1 and reloading the Category */
         $firstProduct->setPrice(20);
         $firstProduct->save();
         $responseMissHeaders = $this->graphQlQueryForHttpHeaders($categoryQuery, $variables);
         preg_match('/X-Magento-Cache-Debug: (.*?)\n/', $responseMissHeaders, $matchesMiss);
         $this->assertEquals('MISS', rtrim($matchesMiss[1], "\r"));
 
-        /** cache-debug should be a MISS for product 1 after it is updated - cache invalidation */
+        /** Cache-debug should be a MISS for product 1 after it is updated - cache invalidation */
         $responseHeadersFirstProduct = $this->graphQlQueryForHttpHeaders($product1Query);
         $this->assertContains('X-Magento-Cache-Debug: MISS', $responseHeadersFirstProduct);
 

dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Quote/Guest/CartCacheTest.php

@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\PageCache\Quote\Guest;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ *  End to end test which creates an empty cart and add product to the cart and load the cart.
+ *  Validates that the cache-debug header is a MISS for any subsequent cart requests
+ *
+ * @magentoApiDataFixture Magento/Catalog/_files/products.php
+ */
+class CartCacheTest extends GraphQlAbstract
+{
+    /** @var  string */
+    private $maskedQuoteId;
+
+    protected function setUp()
+    {
+        $this->markTestSkipped(
+            'This test will stay skipped until DEVOPS-4924 is resolved'
+        );
+    }
+    /**
+     * Tests that X-Magento-Tags are correct
+     */
+    public function testCartIsNotCached()
+    {
+        $qty = 2;
+        $sku = 'simple';
+        $cartId = $this->createEmptyCart();
+        $this->addSimpleProductToCart($cartId, $qty, $sku);
+        $getCartQuery = $this->checkCart($cartId);
+        $response = $this->graphQlQuery($getCartQuery);
+        self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('items', $response['cart']);
+
+        $responseMissHeaders = $this->graphQlQueryForHttpHeaders($getCartQuery);
+        $this->assertContains('X-Magento-Cache-Debug: MISS', $responseMissHeaders);
+        
+        /** Cache debug header value is still a MISS for any subsequent request */
+        $responseMissHeadersNext = $this->graphQlQueryForHttpHeaders($getCartQuery);
+        $this->assertContains('X-Magento-Cache-Debug: MISS', $responseMissHeadersNext);
+    }
+
+    /**
+     * Create a guest cart which generates a maskedQuoteId
+     *
+     * @return mixed
+     */
+    private function createEmptyCart()
+    {
+        $query =
+            <<<QUERY
+        mutation
+            {
+               createEmptyCart
+            }
+QUERY;
+
+        $response = $this->graphQlMutation($query);
+        $this->maskedQuoteId = $response['createEmptyCart'];
+        return $this->maskedQuoteId;
+    }
+
+    /**
+     * Add simple product to the cart using the maskedQuoteId
+     * @param $maskedCartId
+     * @param $qty
+     * @param $sku
+     */
+    private function addSimpleProductToCart($maskedCartId, $qty, $sku)
+    {
+        $addProductToCartQuery =
+            <<<QUERY
+        mutation {  
+        addSimpleProductsToCart(
+          input: {
+            cart_id: "{$maskedCartId}"
+            cartItems: [
+              {
+                data: {
+                  qty: $qty
+                  sku: "$sku"
+                }
+              }
+            ]
+          }
+        ) {
+          cart {
+            items {
+              qty
+              product {
+                sku
+              }
+            }
+          }
+        }
+        }
+QUERY;
+        $response = $this->graphQlMutation($addProductToCartQuery);
+        self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
+    }
+
+    /**
+     *
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function checkCart(string $maskedQuoteId): string
+    {
+        return <<<QUERY
+{
+  cart(cart_id: "{$maskedQuoteId}") {
+    items {
+      id
+      qty
+      product {
+        sku
+      }
+    }
+  }
+}
+QUERY;
+    }
+}