MC-20075: Fix Skipped MFTF Tests From MC-17140: MC-14536, MC-14538, MC-14720

Author: SeruyV

app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckCartDiscountAndSummaryActionGroup.xml

@@ -17,13 +17,12 @@
             <argument name="total" type="string"/>
             <argument name="discount" type="string"/>
         </arguments>
-        
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForPrices"/>
+        <waitForElement time="30" selector="{{CheckoutCartSummarySection.estimateShippingAndTaxForm}}" stepKey="waitForEstimateShippingAndTaxForm"/>
+        <waitForElement time="30" selector="{{CheckoutCartSummarySection.shippingMethodForm}}" stepKey="waitForShippingMethodForm"/>
+        <waitForElementVisible time="30" selector="{{CheckoutCartSummarySection.total}}" stepKey="waitForTotalElement"/>
+        <see selector="{{CheckoutCartSummarySection.total}}" userInput="${{total}}" stepKey="assertTotal"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscountElement"/>
         <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-${{discount}}" stepKey="assertDiscount"/>
-        <wait time="10" stepKey="waitForTotalPrice"/>
-        <reloadPage stepKey="reloadPage" after="waitForTotalPrice" />
-        <waitForPageLoad after="reloadPage" stepKey="WaitForPageLoaded" />
-        <see selector="{{CheckoutCartSummarySection.total}}" userInput="${{total}}" stepKey="assertTotal" after="WaitForPageLoaded"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml

@@ -33,5 +33,6 @@
         <element name="methodName" type="text" selector="#co-shipping-method-form label"/>
         <element name="shippingPrice" type="text" selector="#co-shipping-method-form span .price"/>
         <element name="shippingMethodElementId" type="radio" selector="#s_method_{{carrierCode}}_{{methodCode}}" parameterized="true"/>
+        <element name="estimateShippingAndTaxForm" type="block" selector="#shipping-zip-form"/>
     </section>
 </sections>

app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminDeleteCartPriceRuleActionGroup.xml

@@ -18,14 +18,13 @@
 
         <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="goToCartPriceRules"/>
         <waitForPageLoad stepKey="waitForCartPriceRules"/>
-        <click selector="{{AdminCartPriceRulesFormSection.resetSearchFilter}}" stepKey="resetFilterBeforeDelete"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="resetFilterBeforeDelete"/>
         <waitForPageLoad stepKey="waitForCartPriceRulesResetFilter"/>
         <fillField selector="{{AdminCartPriceRulesSection.filterByNameInput}}" userInput="{{ruleName.name}}" stepKey="filterByName"/>
         <click selector="{{AdminCartPriceRulesSection.searchButton}}" stepKey="doFilter"/>
         <click selector="{{AdminCartPriceRulesSection.rowByIndex('1')}}" stepKey="goToEditRulePage"/>
         <click selector="{{AdminCartPriceRulesFormSection.delete}}" stepKey="clickDeleteButton"/>
-        <click selector="{{AdminCartPriceRulesFormSection.modalAcceptButton}}" stepKey="confirmDelete"/>
-        <click selector="{{AdminCartPriceRulesFormSection.resetSearchFilter}}" stepKey="resetFilterAfterDelete"/>
-        <waitForPageLoad stepKey="waitForCartPriceRulesAfterDelete"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
     </actionGroup>
 </actionGroups>