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

Author: Prabhu Ram

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

@@ -77,16 +77,16 @@ public function testCacheTagsAndCacheDebugHeaderForProducts()
     /**
      * Tests if Magento cache tags for categories are generated properly. Also tests the use case for cache invalidation
      *
-     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_in_multiple_categories.php
      */
     public function testCacheTagFromResponseHeaderForCategoriesWithProduct()
     {
         $this->markTestSkipped(
             'This test will stay skipped until DEVOPS-4924 is resolved'
         );
-        $firstProductSku = 'simple-4';
-        $secondProductSku = 'simple-5';
-        $categoryId ='10';
+        $firstProductSku = 'simple333';
+        $secondProductSku = 'simple444';
+        $categoryId ='4';
         $categoryQuery
             = <<<'QUERY'
 query GetCategoryQuery($id: Int!, $pageSize: Int!, $currentPage: Int!) {
@@ -107,7 +107,7 @@ public function testCacheTagFromResponseHeaderForCategoriesWithProduct()
     }
 QUERY;
         $variables =[
-            'id' => 10,
+            'id' => 4,
             'pageSize'=> 10,
             'currentPage' => 1
         ];

dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php

@@ -267,24 +267,3 @@
     $product->getSku(),
     [10, 11, 12, 13]
 );
-
-/** @var $product \Magento\Catalog\Model\Product */
-$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-$product->isObjectNew(true);
-$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-    ->setAttributeSetId($defaultAttributeSet)
-    ->setStoreId(1)
-    ->setWebsiteIds([1])
-    ->setName('Simple Product Five')
-    ->setSku('simple-5')
-    ->setPrice(10)
-    ->setWeight(18)
-    ->setStockData(['use_config_manage_stock' => 0])
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-    ->save();
-
-$categoryLinkManagement->assignProductToCategories(
-    $product->getSku(),
-    [10, 11, 12, 13]
-);

dev/tests/integration/testsuite/Magento/Catalog/_files/categories_rollback.php

@@ -14,7 +14,7 @@
 // Remove products
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-$productsToDelete = ['simple', '12345', 'simple-3', 'simple-4','simple-5'];
+$productsToDelete = ['simple', '12345', 'simple-3', 'simple-4'];
 
 foreach ($productsToDelete as $sku) {
     try {