MC-25238: Unstable Test "StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest"

Author: OlgaVasyltsun

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

@@ -13,10 +13,11 @@
             <argument name="address" defaultValue="US_Address_TX" type="entity"/>
         </arguments>
         <conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.estimateShippingAndTaxSummary}}" visible="false" stepKey="openShippingDetails"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" stepKey="waitForSummarySectionLoad"/>
         <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="{{address.country_id}}" stepKey="selectCountry"/>
         <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{address.state}}" stepKey="selectState"/>
         <waitForElementVisible selector="{{CheckoutCartSummarySection.postcode}}" stepKey="waitForPostCodeVisible"/>
         <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{address.postcode}}" stepKey="selectPostCode"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDiappear"/>
     </actionGroup>
-</actionGroups>
+</actionGroups>

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

@@ -13,8 +13,9 @@
             <title value="Verify UK customer checkout with different billing and shipping address and register customer after checkout"/>
             <description value="Checkout as UK customer with different shipping/billing address and register checkout method"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MC-14712"/>
+            <testCaseId value="MC-28288"/>
             <group value="mtf_migrated"/>
+            <group value="checkout"/>
         </annotations>
 
         <before>
@@ -25,30 +26,30 @@
         </before>
         <after>
             <!-- Sign out Customer from storefront -->
-            <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openHomePage"/>
-            <actionGroup ref="StorefrontSignOutActionGroup" stepKey="customerLogout"/>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
             <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
-            <actionGroup ref="AdminDeleteCustomerInGridActionGroup" stepKey="deleteCustomer">
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
                 <argument name="customerEmail" value="UKCustomer.email"/>
             </actionGroup>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearCustomersGridFilter"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
 
         <!--Open Product page in StoreFront and assert product and price range -->
         <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKeyActionGroup" stepKey="openProductPageAndVerifyProduct">
-            <argument name="product" value="$$simpleProduct$$"/>
+            <argument name="product" value="$simpleProduct$"/>
         </actionGroup>
 
         <!--Add product to the cart -->
-        <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="addSimpleProductToCart">
-            <argument name="productQty" value="1"/>
+        <actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$simpleProduct$"/>
         </actionGroup>
 
         <!--Open View and edit -->
         <actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="openCartFromMiniCart"/>
 
         <!-- Fill the Estimate Shipping and Tax section -->
-        <actionGroup ref="CartFillEstimateShippingAndTaxActionGroup" stepKey="fillEstimateShippingAndTaxFields"/>
+        <actionGroup ref="CheckoutFillEstimateShippingAndTaxActionGroup" stepKey="fillEstimateShippingAndTaxFields"/>
         <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="goToCheckout"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
 
@@ -57,11 +58,11 @@
             <argument name="customer" value="UKCustomer"/>
             <argument name="customerAddress" value="updateCustomerUKAddress"/>
         </actionGroup>
-        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="goToBillingStep"/>
+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShipping"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToBillingStep"/>
         <waitForElementVisible selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="waitForSameBillingAndShippingAddressCheckboxVisible"/>
         <uncheckOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="uncheckSameBillingAndShippingAddress"/>
         <conditionalClick selector="{{CheckoutShippingSection.editAddressButton}}" dependentSelector="{{CheckoutShippingSection.editAddressButton}}" visible="true" stepKey="clickEditBillingAddressButton"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForBillingAddressFormLoad"/>
 
         <!-- Fill Billing Address -->
         <actionGroup ref="StorefrontFillBillingAddressActionGroup" stepKey="fillBillingAddressForm"/>
@@ -75,23 +76,18 @@
         <!-- Register customer after checkout -->
         <actionGroup ref="StorefrontRegisterCustomerAfterCheckoutActionGroup" stepKey="registerCustomer"/>
 
-        <!-- Open Order Index Page -->
-        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrdersGrid"/>
-
-        <!-- Filter Order using orderId and assert order-->
-        <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
-            <argument name="orderId" value="$orderId"/>
+        <!-- Open Order Page in admin -->
+        <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrder">
+            <argument name="orderId" value="{$orderId}"/>
         </actionGroup>
 
-        <click selector="{{AdminOrdersGridSection.viewLink('$orderId')}}" stepKey="openOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageToLoad"/>
-
         <!-- Assert Grand Total -->
         <see selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$55.00" stepKey="seeGrandTotal"/>
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderStatus"/>
 
         <!-- Ship the order and assert the status -->
-        <actionGroup ref="AdminShipThePendingOrderActionGroup" stepKey="shipTheOrder"/>
+        <actionGroup ref="GoToShipmentIntoOrderActionGroup" stepKey="goToShipment"/>
+        <actionGroup ref="SubmitShipmentIntoOrderActionGroup" stepKey="submitShipment"/>
 
         <!-- Assert order buttons -->
         <actionGroup ref="AdminAssertOrderAvailableButtonsActionGroup" stepKey="assertOrderButtons"/>