Merge remote-tracking branch 'trigger/MC-15215' into pr

Author: Joan He

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

@@ -13,15 +13,14 @@
         </arguments>
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnTheStorePage"/>
         <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterResetButtonClicked" time="10"/>
         <fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
         <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton" />
-        <waitForPageLoad stepKey="waitForPageLoadAfterSearch" time="10"/>
         <see userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
         <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
-
+        <waitForPageLoad stepKey="waitForPageLoadAfterWebsiteSelected" time="30"/>
         <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditStorePage"/>
         <selectOption userInput="No" selector="{{AdminStoresDeleteWebsiteSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
         <click selector="{{AdminStoresDeleteWebsiteSection.deleteButton}}" stepKey="clickDeleteButtonOnDeleteWebsitePage"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the website." stepKey="checkSuccessMessage"/>
     </actionGroup>
 </actionGroups>

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

@@ -8,6 +8,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminStoresDeleteWebsiteSection">
         <element name="createDbBackup" type="select" selector="#store_create_backup"/>
-        <element name="deleteButton" type="button" selector="#delete" timeout="30"/>
+        <element name="deleteButton" type="button" selector="#delete" timeout="120"/>
     </section>
 </sections>