MAGETWO-97025: Check Url Rewrites Correctly Generated for Multiple Storeviews During Product Import

Author: dmitriyprime

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml

@@ -52,15 +52,14 @@
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>
     </actionGroup>
 
-    <actionGroup name="deleteProductByName" extends="deleteProductUsingProductGrid">
+    <actionGroup name="DeleteProductByName" extends="deleteProductUsingProductGrid">
         <arguments>
-            <argument name="product" type="string" defaultValue=""/>
-            <argument name="name" type="string"/>
+            <argument name="product" type="string"/>
         </arguments>
         <remove keyForRemoval="fillProductSkuFilter"/>
-        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{name}}" stepKey="fillProductSkuFilter" after="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{product}}" stepKey="fillProductSkuFilter" after="openProductFilters"/>
         <remove keyForRemoval="seeProductSkuInGrid"/>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{name}}"  stepKey="seeProductNameInGrid" after="clickApplyFilters"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{product}}"  stepKey="seeProductNameInGrid" after="clickApplyFilters"/>
     </actionGroup>
 
     <!--Disabled a product by filtering grid and using change status action-->

app/code/Magento/Store/Test/Mftf/Data/StoreData.xml

@@ -39,7 +39,7 @@
         <data key="store_type">store</data>
         <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
     </entity>
-    <entity name="customStoreENNotUnique" type="store">
+    <entity name="CustomStoreENNotUnique" type="store">
         <data key="name">EN</data>
         <data key="code">en</data>
         <data key="is_active">1</data>
@@ -48,7 +48,7 @@
         <data key="store_type">store</data>
         <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
     </entity>
-    <entity name="customStoreNLNotUnique" type="store">
+    <entity name="CustomStoreNLNotUnique" type="store">
         <data key="name">NL</data>
         <data key="code">nl</data>
         <data key="is_active">1</data>

app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml

@@ -11,6 +11,5 @@
         <element name="delete" type="button" selector="#delete" timeout="30"/>
         <element name="resetButton" type="button" selector="#reset" timeout="30"/>
         <element name="saveButton" type="button" selector="#save" timeout="60"/>
-        <element name="loadingMask" type="text" selector=".loading-mask"/>
     </section>
 </sections>

app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml

@@ -21,33 +21,31 @@
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <!-- Create Store View EN -->
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewEn">
-                <argument name="customStore" value="customStoreENNotUnique"/>
+                <argument name="customStore" value="CustomStoreENNotUnique"/>
             </actionGroup>
             <!-- Create Store View NL -->
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewNl">
-                <argument name="customStore" value="customStoreNLNotUnique"/>
+                <argument name="customStore" value="CustomStoreNLNotUnique"/>
             </actionGroup>
             <createData entity="ApiCategory" stepKey="createCategory">
                 <field key="name">category-admin</field>
             </createData>
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <actionGroup ref="deleteProductByName" stepKey="deleteImportedProduct">
+            <actionGroup ref="DeleteProductByName" stepKey="deleteImportedProduct">
                 <argument name="product" value="productformagetwo76287"/>
-                <argument name="name" value="productformagetwo76287"/>
             </actionGroup>
-            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFiltersIfSet"/>
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
-                <argument name="customStore" value="customStoreENNotUnique"/>
+                <argument name="customStore" value="CustomStoreENNotUnique"/>
             </actionGroup>
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewNl">
-                <argument name="customStore" value="customStoreNLNotUnique"/>
+                <argument name="customStore" value="CustomStoreNLNotUnique"/>
             </actionGroup>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="switchCategoryStoreView" stepKey="switchToStoreViewEn">
-            <argument name="store" value="customStoreENNotUnique.name"/>
+            <argument name="store" value="CustomStoreENNotUnique.name"/>
             <argument name="catName" value="$$createCategory.name$$"/>
         </actionGroup>
         <uncheckOption selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="uncheckUseDefaultValueENStoreView"/>
@@ -57,7 +55,7 @@
             <argument name="value" value="category-english"/>
         </actionGroup>
         <actionGroup ref="switchCategoryStoreView" stepKey="switchToStoreViewNl">
-            <argument name="store" value="customStoreNLNotUnique.name"/>
+            <argument name="store" value="CustomStoreNLNotUnique.name"/>
             <argument name="catName" value="$$createCategory.name$$"/>
         </actionGroup>
         <uncheckOption selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="uncheckUseDefaultValue1"/>