Merge branch 'MC-21228' of github.com:magento-honey-badgers/magento2ce into MC-21228

Prabhu Ram · Prabhu Ram · commit 12dd9182057e · 2020-05-13T17:58:50.000-05:00
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml
@@ -18,9 +18,9 @@
             <testCaseId value="MC-20359"/>
             <group value="Bundle"/>
             <group value="SearchEngineElasticsearch"/>
-<!--            <skip>-->
-<!--                <issueId value="MC-21228"/>-->
-<!--            </skip>-->
+            <skip>
+                <issueId value="MC-34217"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchSimpleProductBySkuWithHyphenTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchSimpleProductBySkuWithHyphenTest.xml
@@ -18,9 +18,9 @@
             <testCaseId value="MC-20361"/>
             <group value="Catalog"/>
             <group value="SearchEngineElasticsearch"/>
-<!--            <skip>-->
-<!--                <issueId value="MC-21228"/>-->
-<!--            </skip>-->
+            <skip>
+                <issueId value="MC-34217"/>
+            </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
@@ -18,9 +18,9 @@
             <testCaseId value="MC-20385"/>
             <group value="Catalog"/>
             <group value="SearchEngineElasticsearch"/>
-<!--            <skip>-->
-<!--                <issueId value="MC-21228"/>-->
-<!--            </skip>-->
+            <skip>
+                <issueId value="MC-34217"/>
+            </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
@@ -23,7 +23,7 @@
         </annotations>
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>
-            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+            <createData entity="productAlphabeticalB" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -37,7 +37,8 @@
         <actionGroup ref="SetMinimalQueryLengthActionGroup" stepKey="setMinQueryLength"/>
         <comment userInput="Go to Storefront and search for product" stepKey="searchProdUsingMinQueryLength"/>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
-        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="s" stepKey="fillAttribute"/>
+        <comment userInput="Quick search by single character and avoid using ES stopwords" stepKey="commentQuickSearch"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="B" stepKey="fillAttribute"/>
         <waitForPageLoad stepKey="waitForSearchTextBox"/>
         <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
         <waitForPageLoad stepKey="waitForSearch"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductByNameWithThreeLettersTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductByNameWithThreeLettersTest.xml
@@ -17,9 +17,6 @@
             <group value="CatalogSearch"/>
             <group value="SearchEngineElasticsearch"/>
             <group value="mtf_migrated"/>
-<!--            <skip>-->
-<!--                <issueId value="MC-21228"/>-->
-<!--            </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/QuickSearchTwoProductsWithSameWeightTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchTwoProductsWithSameWeightTest.xml
@@ -17,9 +17,6 @@
             <group value="CatalogSearch"/>
             <group value="SearchEngineElasticsearch"/>
             <group value="mtf_migrated"/>
-<!--            <skip>-->
-<!--                <issueId value="MC-21228"/>-->
-<!--            </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
@@ -19,7 +19,7 @@
             <group value="mtf_migrated"/>
             <group value="SearchEngineElasticsearch"/>
             <skip>
-                <issueId value="MC-21228"/>
+                <issueId value="MC-34217"/>
             </skip>
         </annotations>
         <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontPartialWordQuickSearchUsingElasticSearchTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontPartialWordQuickSearchUsingElasticSearchTest.xml
@@ -16,7 +16,7 @@
             <description value="Support quick search with Partial word search using ES"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-34205"/>
-            <group value="SearchEngineElasticsearch" />
+            <group value="SearchEngineElasticsearch"/>
         </annotations>
         <before>
             <!-- Create subcategory -->
@@ -30,14 +30,12 @@
             <createData entity="ApiSimpleProductWithNoSpace" stepKey="product3">
                 <requiredEntity createDataKey="newCategory"/>
             </createData>
-            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
             <deleteData createDataKey="product1" stepKey="deleteProduct1"/>
             <deleteData createDataKey="product2" stepKey="deleteProduct2"/>
             <deleteData createDataKey="product3" stepKey="deleteProduct3"/>
             <deleteData createDataKey="newCategory" stepKey="deleteCategory"/>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchConfigurableBySkuWithHyphenTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchConfigurableBySkuWithHyphenTest.xml
@@ -18,9 +18,9 @@
             <testCaseId value="MC-20389"/>
             <group value="ConfigurableProduct"/>
             <group value="SearchEngineElasticsearch"/>
-<!--            <skip>-->
-<!--                <issueId value="MC-21228"/>-->
-<!--            </skip>-->
+            <skip>
+                <issueId value="MC-34217"/>
+            </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
@@ -18,9 +18,6 @@
             <testCaseId value="MC-249"/>
             <group value="ConfigurableProduct"/>
             <group value="SearchEngineElasticsearch"/>
-<!--            <skip>-->
-<!--                <issueId value="MC-21228"/>-->
-<!--            </skip>-->
         </annotations>
         <before>
             <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
@@ -148,6 +145,9 @@
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </after>
 
+        <magentoCLI command="indexer:reindex" stepKey="reindexAll"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <!-- Quick search the storefront for the first attribute option -->
         <amOnPage stepKey="goToStoreFront" url="{{StorefrontHomePage.url}}"/>
         <waitForPageLoad stepKey="waitForStorefront"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAdvanceCatalogSearchDownloadableBySkuWithHyphenTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAdvanceCatalogSearchDownloadableBySkuWithHyphenTest.xml
@@ -18,9 +18,9 @@
              <testCaseId value="MC-252"/>
              <group value="Downloadable"/>
              <group value="SearchEngineElasticsearch"/>
-<!--             <skip>-->
-<!--                 <issueId value="MC-21228"/>-->
-<!--             </skip>-->
+             <skip>
+                 <issueId value="MC-34217"/>
+             </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/StorefrontAdvanceCatalogSearchGroupedProductBySkuWithHyphenTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchGroupedProductBySkuWithHyphenTest.xml
@@ -18,9 +18,9 @@
             <testCaseId value="MC-20519"/>
             <group value="GroupedProduct"/>
             <group value="SearchEngineElasticsearch"/>
-<!--            <skip>-->
-<!--                  <issueId value="MC-21228"/>-->
-<!--           </skip>-->
+            <skip>
+                  <issueId value="MC-34217"/>
+           </skip>
 
         </annotations>
         <before>
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobileTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobileTest.xml
@@ -18,9 +18,6 @@
             <testCaseId value="MC-6092"/>
             <group value="LayeredNavigation"/>
             <group value="SearchEngineElasticsearch"/>
-            <skip>
-                <issueId value="MC-21228"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="productDropDownAttribute" stepKey="attribute"/>
@@ -58,7 +55,7 @@
         <!-- Check storefront mobile view for shop by button is functioning as expected -->
         <comment userInput="Check storefront mobile view for shop by button is functioning as expected" stepKey="commentCheckShopByButton" />
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
-        <submitForm selector="#search_mini_form" parameterArray="['q' => 'Test Simple Product']" stepKey="fillSearchBar" />
+        <submitForm selector="#search_mini_form" parameterArray="['q' => 'Simple']" stepKey="fillSearchBar" />
         <resizeWindow width="600" height="800" stepKey="resizeWindow"/>
         <waitForPageLoad stepKey="waitForHomePageToLoad2"/>
         <seeElement selector="{{StorefrontCategorySidebarMobileSection.shopByButton}}" stepKey="seeShopByButton"/>
