MC-18826: Increase test coverage for Cart & Checkout and Order Processing functional areas

- Automation test for MC-6411

Author: Lusine-Papyan

app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderSelectShippingMethodActionGroup.xml

@@ -10,14 +10,14 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminOrderSelectShippingMethodActionGroup">
         <arguments>
-            <argument name="methodTitle" type="string" defaultValue="Flat Rate"/>
-            <argument name="methodName" type="string" defaultValue="Fixed"/>
+            <argument name="methodTitle" type="string" defaultValue="flatrate"/>
+            <argument name="methodName" type="string" defaultValue="fixed"/>
         </arguments>
         <waitForElementVisible selector="{{AdminInvoicePaymentShippingSection.getShippingMethod}}" stepKey="waitForShippingMethodsOpen"/>
         <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethod}}" stepKey="openShippingMethod"/>
         <conditionalClick selector="{{AdminInvoicePaymentShippingSection.getShippingMethod}}" dependentSelector="{{AdminInvoicePaymentShippingSection.fixedPriceShippingMethod(methodTitle, methodName)}}" visible="false" stepKey="openShippingMethodSecondTime"/>
-        <waitForElementVisible selector="{{AdminInvoicePaymentShippingSection.fixedPriceShippingMethod(methodTitle, methodName)}}" stepKey="waitForShippingMethod"/>
-        <click selector="{{AdminInvoicePaymentShippingSection.fixedPriceShippingMethod(methodTitle, methodName)}}" stepKey="chooseShippingMethod"/>
+        <waitForElementVisible selector="{{AdminInvoicePaymentShippingSection.fixedPriceShippingMethod(methodName, methodTitle)}}" stepKey="waitForShippingMethod"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.fixedPriceShippingMethod(methodName, methodTitle)}}" stepKey="chooseShippingMethod"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml

@@ -17,7 +17,7 @@
         <element name="CreateShipment" type="checkbox" selector=".order-shipping-address input[name='invoice[do_shipment]']"/>
         <element name="getShippingMethodAndRates" type="button" selector="//span[text()='Get shipping methods and rates']" timeout="60"/>
         <element name="shippingMethod" type="button" selector="//label[contains(text(), 'Fixed')]" timeout="60"/>
-        <element name="fixedPriceShippingMethod" type="button" selector="//*[contains(text(), '{{methodTitle}}')]/parent::dl//label[contains(text(), '{{methodName}}')]"  parameterized="true"/>
+        <element name="fixedPriceShippingMethod" type="button" selector="#s_method_{{methodName}}_{{methodTitle}}"  parameterized="true"/>
         <element name="getShippingMethod" type="button" selector="#order-shipping-method-summary a"/>
     </section>
 </sections>

app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateOrderCustomStoreShippingMethodTableRatesTest.xml

@@ -21,12 +21,10 @@
         </annotations>
         <before>
             <!--Create product and customer-->
-            <comment userInput="Create product and customer" stepKey="commentCreateProductAndCustomer"/>
             <createData entity="SimpleProduct2" stepKey="createProduct"/>
             <createData entity="Simple_Customer_Without_Address" stepKey="createCustomer"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <!--Create website, store group and store view-->
-            <comment userInput="Create website, store group and store view" stepKey="commentCreateWebsiteStoreAndView"/>
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
                 <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
                 <argument name="websiteCode" value="{{customWebsite.code}}"/>
@@ -41,7 +39,6 @@
                 <argument name="customStore" value="customStore"/>
             </actionGroup>
             <!--Enable Table Rate method and import csv file-->
-            <comment userInput="Enable Table Rate method and import csv file" stepKey="commentEnableTableRates"/>
             <actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
             <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="switchDefaultWebsite">
                 <argument name="website" value="_defaultWebsite"/>
@@ -64,7 +61,6 @@
         </before>
         <after>
             <!--Delete created data-->
-            <comment userInput="Delete created data" stepKey="commetnDeleteCreatedData"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteSecondCreatedCustomer">
@@ -76,7 +72,6 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!--Assign product to custom website-->
-        <comment userInput="Assign product to custom website" stepKey="commentAssignProductToWebsite"/>
         <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="goToProductEditPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
         <actionGroup ref="unassignWebsiteFromProductActionGroup" stepKey="unassignWebsiteInProduct">
@@ -87,7 +82,6 @@
         </actionGroup>
         <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
         <!--Assign customer to custom website-->
-        <comment userInput="Assign customer to custom website" stepKey="commentAssignCustomerToWebsite"/>
         <actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
@@ -96,7 +90,6 @@
         </actionGroup>
         <actionGroup ref="AdminSaveCustomerAndAssertSuccessMessage" stepKey="saveAndCheckSuccessMessage"/>
         <!--Create order-->
-        <comment userInput="Create order" stepKey="commentCreateOrder"/>
         <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
             <argument name="customer" value="$$createCustomer$$"/>
             <argument name="storeView" value="customStore"/>
@@ -109,10 +102,9 @@
             <argument name="address" value="US_Address_TX"/>
         </actionGroup>
         <!--Choose Best Way shipping Method-->
-        <comment userInput="Choose Best Way shipping Method" stepKey="commentChooseShippingMethod"/>
         <actionGroup ref="AdminOrderSelectShippingMethodActionGroup" stepKey="chooseBestWayMethod">
-            <argument name="methodTitle" value="Best Way"/>
-            <argument name="methodName" value="Table Rate"/>
+            <argument name="methodTitle" value="bestway"/>
+            <argument name="methodName" value="tablerate"/>
         </actionGroup>
         <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
     </test>