MC-20539: Fix MFTF tests to work with elasticsearch

dthampy · dthampy · commit b6de19c6d6e6 · 2020-04-09T10:15:12.000-05:00
- fixing MFTF tests
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@ atlassian*
 /app/config_sandbox
 /app/etc/config.php
 /app/etc/env.php
+/dev/tests/acceptance/tests/functional/Magento/_generated/*
 /app/code/Magento/TestModule*
 /lib/internal/flex/uploader/.actionScriptProperties
 /lib/internal/flex/uploader/.flexProperties
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByDescriptionMysqlTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByDescriptionMysqlTest.xml
@@ -17,10 +17,10 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-20473"/>
             <group value="Bundle"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByNameMysqlTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByNameMysqlTest.xml
@@ -17,10 +17,10 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-20472"/>
             <group value="Bundle"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByPriceMysqlTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByPriceMysqlTest.xml
@@ -17,10 +17,10 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-20475"/>
             <group value="Bundle"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByShortDescriptionMysqlTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByShortDescriptionMysqlTest.xml
@@ -17,10 +17,10 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-20474"/>
             <group value="Bundle"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml
@@ -17,10 +17,10 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-20359"/>
             <group value="Bundle"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeMysqlTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeMysqlTest.xml
@@ -17,10 +17,10 @@
             <testCaseId value="MC-20467"/>
             <group value="Catalog"/>
             <group value="Product Attributes"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeMysqlTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeMysqlTest.xml
@@ -17,10 +17,10 @@
             <testCaseId value="MC-20471"/>
             <group value="Catalog"/>
             <group value="Product Attributes"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserMysqlTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserMysqlTest.xml
@@ -16,10 +16,10 @@
             <description value="User browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out using the Mysql search engine."/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-20476"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchSimpleProductBySkuWithHyphenTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchSimpleProductBySkuWithHyphenTest.xml
@@ -17,10 +17,10 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-20361"/>
             <group value="Catalog"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="product"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchVirtualProductBySkuWithHyphenTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchVirtualProductBySkuWithHyphenTest.xml
@@ -17,10 +17,10 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-20385"/>
             <group value="Catalog"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="ApiVirtualProductWithDescription" stepKey="product"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
@@ -18,10 +18,10 @@
             <testCaseId value="MC-6325"/>
             <useCaseId value="MAGETWO-58764"/>
             <group value="CatalogSearch"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductByNameWithThreeLettersTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductByNameWithThreeLettersTest.xml
@@ -15,11 +15,11 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-15034"/>
             <group value="CatalogSearch"/>
-            <group value="SearchEngineMysql"/>
+<!--            <group value="SearchEngineMysql"/>-->
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,3); return ret;" stepKey="getFirstThreeLetters" before="searchStorefront"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchTwoProductsWithDifferentWeightTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchTwoProductsWithDifferentWeightTest.xml
@@ -15,11 +15,11 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-14797"/>
             <group value="CatalogSearch"/>
-            <group value="SearchEngineMysql"/>
+<!--            <group value="SearchEngineMysql"/>-->
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <actionGroup ref="AdminCreateAttributeWithSearchWeightActionGroup" stepKey="createProduct1Attribute">
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchTwoProductsWithSameWeightTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchTwoProductsWithSameWeightTest.xml
@@ -15,11 +15,11 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-14796"/>
             <group value="CatalogSearch"/>
-            <group value="SearchEngineMysql"/>
+<!--            <group value="SearchEngineMysql"/>-->
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialNameTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialNameTest.xml
@@ -17,10 +17,10 @@
             <severity value="CRITICAL"/>
             <group value="searchFrontend"/>
             <group value="mtf_migrated"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
             <argument name="productName" value="abc"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchConfigurableBySkuWithHyphenTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchConfigurableBySkuWithHyphenTest.xml
@@ -17,10 +17,10 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-20389"/>
             <group value="ConfigurableProduct"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="SimpleSubCategory" stepKey="categoryHandle" before="simple1Handle"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
@@ -17,10 +17,10 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-249"/>
             <group value="ConfigurableProduct"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -17,10 +17,10 @@
             <description value="New user signup and browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-25681"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAdvanceCatalogSearchDownloadableBySkuWithHyphenTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAdvanceCatalogSearchDownloadableBySkuWithHyphenTest.xml
@@ -17,10 +17,10 @@
              <severity value="MAJOR"/>
              <testCaseId value="MC-252"/>
              <group value="Downloadable"/>
-             <group value="SearchEngineMysql"/>
-             <skip>
-                 <issueId value="MC-18948"/>
-             </skip>
+<!--             <group value="SearchEngineMysql"/>-->
+<!--             <skip>-->
+<!--                 <issueId value="MC-18948"/>-->
+<!--             </skip>-->
          </annotations>
          <before>
              <magentoCLI command="downloadable:domains:add example.com static.magento.com" before="product" stepKey="addDownloadableDomain"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByDescriptionMysqlTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByDescriptionMysqlTest.xml
@@ -16,10 +16,10 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-20468"/>
             <group value="GroupedProduct"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByNameMysqlTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByNameMysqlTest.xml
@@ -16,10 +16,10 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-20464"/>
             <group value="GroupedProduct"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByPriceMysqlTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByPriceMysqlTest.xml
@@ -16,10 +16,10 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-20470"/>
             <group value="GroupedProduct"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByShortDescriptionMysqlTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByShortDescriptionMysqlTest.xml
@@ -16,10 +16,10 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-20469"/>
             <group value="GroupedProduct"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchGroupedProductBySkuWithHyphenTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchGroupedProductBySkuWithHyphenTest.xml
@@ -17,7 +17,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-20519"/>
             <group value="GroupedProduct"/>
-            <group value="SearchEngineMysql"/>
+<!--            <group value="SearchEngineMysql"/>-->
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobileTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobileTest.xml
@@ -17,10 +17,10 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-6092"/>
             <group value="LayeredNavigation"/>
-            <group value="SearchEngineMysql"/>
-            <skip>
-                <issueId value="MC-18948"/>
-            </skip>
+<!--            <group value="SearchEngineMysql"/>-->
+<!--            <skip>-->
+<!--                <issueId value="MC-18948"/>-->
+<!--            </skip>-->
         </annotations>
         <before>
             <createData entity="productDropDownAttribute" stepKey="attribute"/>
diff --git a/app/code/Magento/Search/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Search/Test/Mftf/Data/ConfigData.xml
@@ -7,10 +7,10 @@
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="SearchEngineMysqlConfigData">
-        <data key="path">catalog/search/engine</data>
-        <data key="scope_id">1</data>
-        <data key="label">MySQL</data>
-        <data key="value">mysql</data>
-    </entity>
+<!--    <entity name="SearchEngineMysqlConfigData">-->
+<!--        <data key="path">catalog/search/engine</data>-->
+<!--        <data key="scope_id">1</data>-->
+<!--        <data key="label">MySQL</data>-->
+<!--        <data key="value">mysql</data>-->
+<!--    </entity>-->
 </entities>
diff --git a/app/code/Magento/Search/Test/Mftf/Data/SearchEngineConfigData.xml b/app/code/Magento/Search/Test/Mftf/Data/SearchEngineConfigData.xml
diff --git a/app/code/Magento/Search/Test/Mftf/Suite/SearchEngineMysqlSuite.xml b/app/code/Magento/Search/Test/Mftf/Suite/SearchEngineMysqlSuite.xml
