merge magento/2.3-develop into magento-borg/MAGETWO-92468-make-tests-namespace-agnostic-2.3-develop

Author: Magento CICD

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -492,7 +492,6 @@ input ProductSortInput  @doc(description: "ProductSortInput specifies the attrib
     news_from_date: SortEnum @doc(description: "The beginning date for new product listings, and determines if the product is featured as a new product")
     news_to_date: SortEnum @doc(description: "The end date for new product listings")
     custom_layout_update: SortEnum @doc(description: "XML code that is applied as a layout update to the product page")
-    category_ids: SortEnum @doc(description: "An array of category IDs the product belongs to")
     options_container: SortEnum @doc(description: "If the product has multiple options, determines where they appear on the product page")
     required_options: SortEnum @doc(description: "Indicates whether the product has required options")
     has_options: SortEnum @doc(description: "Indicates whether additional attributes have been created for the product")

app/code/Magento/TaxGraphQl/etc/schema.graphqls

@@ -1,18 +1,6 @@
 # Copyright © Magento, Inc. All rights reserved.
 # See COPYING.txt for license details.
 
-input ProductFilterInput {
-    tax_class_id: FilterTypeInput
-}
-
-interface ProductInterface {
-    tax_class_id: Int
-}
-
-input ProductSortInput {
-    tax_class_id: SortEnum
-}
-
 enum PriceAdjustmentCodesEnum {
     TAX
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php

@@ -232,7 +232,6 @@ public function testCategoryProducts()
         special_price
         special_to_date
         swatch_image
-        tax_class_id
         thumbnail
         thumbnail_label
         tier_price
@@ -358,7 +357,6 @@ private function assertAttributes($actualResponse)
             'meta_keyword',
             'meta_title',
             'short_description',
-            'tax_class_id',
             'country_of_manufacture',
             'gift_message_available',
             'new_from_date',

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php

@@ -211,7 +211,6 @@ public function testQueryAllFieldsSimpleProduct()
             special_price
             special_to_date
             swatch_image
-            tax_class_id
             thumbnail
             thumbnail_label
             tier_price
@@ -460,7 +459,6 @@ public function testQueryMediaGalleryEntryFieldsSimpleProduct()
             special_price
             special_to_date
             swatch_image
-            tax_class_id
             thumbnail
             thumbnail_label
             tier_price
@@ -922,7 +920,6 @@ private function assertEavAttributes($product, $actualResponse)
             'meta_keyword',
             'meta_title',
             'short_description',
-            'tax_class_id',
             'country_of_manufacture',
             'gift_message_available',
             'news_from_date',

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/VirtualProductViewTest.php

@@ -36,7 +36,6 @@ public function testQueryAllFieldsVirtualProduct()
            name
            sku
            type_id
-           tax_class_id
            updated_at
            ... on PhysicalProductInterface {
              weight
@@ -96,7 +95,6 @@ public function testCannotQueryWeightOnVirtualProductException()
            name
            sku
            type_id
-           tax_class_id
            updated_at
            ... on PhysicalProductInterface {
              weight
@@ -130,7 +128,6 @@ private function assertBaseFields($product, $actualResponse)
             ['response_field' => 'attribute_set_id', 'expected_value' => $product->getAttributeSetId()],
             ['response_field' => 'id', 'expected_value' => $product->getId()],
             ['response_field' => 'name', 'expected_value' => $product->getName()],
-            ['response_field' => 'tax_class_id', 'expected_value' => $product->getTaxClassId()],
             ['response_field' => 'sku', 'expected_value' => $product->getSku()],
             ['response_field' => 'type_id', 'expected_value' => $product->getTypeId()]
         ];