Merge remote-tracking branch 'origin/MC-20075' into 2.3-develop-pr76

Author: zakdma

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

@@ -18,12 +18,24 @@
             <argument name="cartSubtotal" type="string"/>
             <argument name="qty" type="string"/>
         </arguments>
-        
-        <see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{productName}}"  stepKey="seeProductNameInMiniCart"/>
-        <see selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="{{productPrice}}" stepKey="seeProductPriceInMiniCart"/>
+
+        <see selector="{{StorefrontMinicartSection.productPriceByName(productName)}}" userInput="{{productPrice}}" stepKey="seeProductPriceInMiniCart"/>
         <seeElement selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="seeCheckOutButtonInMiniCart"/>
         <seeElement selector="{{StorefrontMinicartSection.productQuantity(productName, qty)}}" stepKey="seeProductQuantity1"/>
         <seeElement selector="{{StorefrontMinicartSection.productImage}}" stepKey="seeProductImage"/>
         <see selector="{{StorefrontMinicartSection.productSubTotal}}" userInput="{{cartSubtotal}}" stepKey="seeSubTotal"/>
     </actionGroup>
+
+    <actionGroup name="AssertStorefrontMiniCartProductDetailsAbsentActionGroup">
+        <annotations>
+            <description>Validates that the provided Product details (Name, Price) are
+                not present in the Storefront Mini Shopping Cart.</description>
+        </annotations>
+        <arguments>
+            <argument name="productName" type="string"/>
+            <argument name="productPrice" type="string"/>
+        </arguments>
+
+        <dontSee selector="{{StorefrontMinicartSection.productPriceByName(productName)}}" userInput="{{productPrice}}" stepKey="dontSeeProductPriceInMiniCart"/>
+    </actionGroup>
 </actionGroups>

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/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWhenMoreItemsAddedToTheCartThanDefaultDisplayLimitTest.xml

@@ -15,9 +15,6 @@
             <testCaseId value="MC-14720"/>
             <severity value="CRITICAL"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MC-17140"/>
-            </skip>
         </annotations>
 
         <before>
@@ -280,7 +277,9 @@
         </actionGroup>
 
         <!-- Verify  Product11 is not displayed in Mini Cart -->
-        <dontSee selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="$$simpleProduct11.name$$"  stepKey="dontSeeProduct11NameInMiniCart"/>
-        <dontSee selector="{{StorefrontMinicartSection.miniCartItemsText}}" userInput="110" stepKey="dontSeeProduct11PriceInMiniCart"/>
+        <actionGroup ref="AssertStorefrontMiniCartProductDetailsAbsentActionGroup" stepKey="assertSimpleProduct11IsNotInMiniCart">
+            <argument name="productName" value="$$simpleProduct11.name$$"/>
+            <argument name="productPrice" value="$110.00"/>
+        </actionGroup>
     </test>
 </tests>

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

@@ -15,13 +15,16 @@
         <arguments>
             <argument name="ruleName" type="entity"/>
         </arguments>
-        
+
         <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="goToCartPriceRules"/>
         <waitForPageLoad stepKey="waitForCartPriceRules"/>
+        <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"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
     </actionGroup>
 </actionGroups>