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

Author: avattam06

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

@@ -151,7 +151,7 @@ public function testCacheTagForCategoriesWithProduct()
     /**
      * Get Product query
      *
-     * @param  string $productSku
+     * @param string $productSku
      * @return string
      */
     private function getProductQuery(string $productSku): string

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

@@ -45,10 +45,8 @@ public function testCacheTagsHaveExpectedValue()
 
         $this->assertArrayHasKey('X-Magento-Tags', $response['headers']);
         $actualTags = explode(',', $response['headers']['X-Magento-Tags']);
-        $expectedTags = ["cms_b", "cms_b_{$blockIdentifier}", "cms_b_{$blockId}", "FPC"];
-        foreach ($expectedTags as $expectedTag) {
-            $this->assertContains($expectedTag, $actualTags);
-        }
+        $expectedTags = ["cms_b", "cms_b_{$blockId}", "cms_b_{$blockIdentifier}", "FPC"];
+        $this->assertEquals($expectedTags, $actualTags);
     }
 
     /**

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

@@ -52,9 +52,7 @@ public function testCacheTagsHaveExpectedValue()
         $this->assertArrayHasKey('X-Magento-Tags', $response['headers']);
         $actualTags = explode(',', $response['headers']['X-Magento-Tags']);
         $expectedTags = ["cms_p", "cms_p_{$pageId}", "FPC"];
-        foreach ($expectedTags as $expectedTag) {
-            $this->assertContains($expectedTag, $actualTags);
-        }
+        $this->assertEquals($expectedTags, $actualTags);
     }
 
     /**

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

@@ -10,7 +10,7 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- *  Test cart queries are note cached
+ * Test cart queries are not cached
  *
  * @magentoApiDataFixture Magento/Catalog/_files/products.php
  */
@@ -67,11 +67,11 @@ private function createEmptyCart(): string
     /**
      * Add simple product to the cart using the maskedQuoteId
      *
-     * @param $maskedCartId
-     * @param $qty
-     * @param $sku
+     * @param string $maskedCartId
+     * @param int $qty
+     * @param string $sku
      */
-    private function addSimpleProductToCart($maskedCartId, $qty, $sku)
+    private function addSimpleProductToCart(string $maskedCartId, int $qty, string $sku): void
     {
         $addProductToCartQuery =
             <<<QUERY

dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Cms/BlockCacheTest.php

@@ -77,8 +77,6 @@ public function testCmsBlocksRequestHasCorrectTags(): void
         $expectedCacheTags = ['cms_b', 'cms_b_' . $block->getId(), 'cms_b_' . $block->getIdentifier(), 'FPC'];
         $rawActualCacheTags = $response->getHeader('X-Magento-Tags')->getFieldValue();
         $actualCacheTags = explode(',', $rawActualCacheTags);
-        foreach ($expectedCacheTags as $expectedCacheTag) {
-            $this->assertContains($expectedCacheTag, $actualCacheTags);
-        }
+        $this->assertEquals($expectedCacheTags, $actualCacheTags);
     }
 }