MC-22132: MFTF tests stabilization - AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest MC-12656

Author: zakdma

app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml

@@ -29,7 +29,8 @@
         <waitForElementVisible selector="{{AdminConfirmationModalSection.title}}" stepKey="waitingForWarningModal"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreDelete"/>
         <waitForPageLoad stepKey="waitForSuccessMessage"/>
-        <see userInput="You deleted the store view." stepKey="seeDeleteMessage"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitSuccessMessageAppears"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the store view." stepKey="seeDeleteMessage"/>
     </actionGroup>
 
     <actionGroup name="DeleteCustomStoreViewBackupEnabledYesActionGroup">
@@ -72,4 +73,37 @@
         <waitForPageLoad stepKey="waitForStoreToLoad"/>
         <see selector="{{AdminStoresGridSection.emptyText}}" userInput="We couldn't find any records." stepKey="seeAssertStoreViewNotInGridMessage"/>
     </actionGroup>
+
+    <actionGroup name="AdminDeleteStoreViewIfExistsActionGroup">
+        <annotations>
+            <description>Goes to the Admin Stores grid page. Deletes the provided Store (if exists) without creating a Backup. Validates that the Success Message is present and correct.</description>
+        </annotations>
+        <arguments>
+            <argument name="storeViewName" type="string"/>
+        </arguments>
+
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{storeViewName}}" stepKey="fillSearchStoreViewField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+
+        <executeInSelenium function="function($webdriver) use ($I) {
+                $items = $webdriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('.col-store_title>a'));
+                if(!empty($items)) {
+                    $I->click('.col-store_title>a');
+                    $I->waitForPageLoad(10);
+                    $I->click('#delete');
+                    $I->waitForPageLoad(30);
+                    $I->selectOption('select#store_create_backup', 'No');
+                    $I->click('#delete');
+                    $I->waitForPageLoad(30);
+                    $I->waitForElementVisible('aside.confirm .modal-title', 10);
+                    $I->click('aside.confirm .modal-footer button.action-accept');
+                    $I->waitForPageLoad(60);
+                    $I->waitForElementVisible('#messages div.message-success', 10);
+                    $I->see('You deleted the store view.', '#messages div.message-success');
+                }
+            }" stepKey="deleteStoreViewIfExists"/>
+    </actionGroup>
+
 </actionGroups>

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

@@ -18,7 +18,17 @@
             <group value="urlRewrite"/>
         </annotations>
         <before>
+            <createData entity="ApiCategory" stepKey="createCategory">
+                <field key="name">category-admin</field>
+            </createData>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminDeleteStoreViewIfExistsActionGroup" stepKey="deleteENStoreViewIfExists">
+                <argument name="storeViewName" value="{{customStoreENNotUnique.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewIfExistsActionGroup" stepKey="deleteNLStoreViewIfExists">
+                <argument name="storeViewName" value="{{customStoreNLNotUnique.name}}"/>
+            </actionGroup>
+
             <!-- Create Store View EN -->
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewEn">
                 <argument name="customStore" value="customStoreENNotUnique"/>
@@ -27,9 +37,6 @@
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewNl">
                 <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"/>
@@ -44,6 +51,7 @@
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewNl">
                 <argument name="customStore" value="customStoreNLNotUnique"/>
             </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearStoreFilters"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="switchCategoryStoreView" stepKey="switchToStoreViewEn">