refactored

Author: AnnaAPak

app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml

@@ -47,7 +47,6 @@
               <requiredEntity createDataKey="createGuestCartOne"/>
             </createData>
 
-
             <createData entity="GuestCart" stepKey="createGuestCartTwo"/>
                 <createData entity="SimpleCartItem" stepKey="addCartItemTwo">
                 <requiredEntity createDataKey="createGuestCartTwo"/>
@@ -69,72 +68,33 @@
             </createData>
 
         </before>
+
         <after>
-            <!-- Delete data -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <!-- Create first order -->
-        <!-- <actionGroup ref="CreateOrderActionGroup" stepKey="createFirstOrder">
-            <argument name="product" value="$$createProduct$$"/>
-            <argument name="customer" value="$$createCustomer$$"/>
-        </actionGroup>
-        <grabTextFrom selector="|Order # (\d+)|" stepKey="getFirstOrderId"/>
-        <assertNotEmpty stepKey="assertOrderIdIsNotEmpty" after="getFirstOrderId">
-			<actualResult type="const">$getFirstOrderId</actualResult>
-        </assertNotEmpty> -->
-
-        <!-- Create Shipment for first Order -->
-        <!-- <actionGroup ref="AdminCreateInvoiceAndShipmentActionGroup" stepKey="createShipmentForFirstOrder"/> -->
-
-        <!-- Create second order -->
-        <!-- <actionGroup ref="CreateOrderActionGroup" stepKey="createSecondOrder">
-            <argument name="product" value="$$createProduct$$"/>
-            <argument name="customer" value="$$createCustomer$$"/>
-        </actionGroup>
-        <grabTextFrom selector="|Order # (\d+)|" stepKey="getSecondOrderId"/>
-        <assertNotEmpty stepKey="assertSecondOrderIdIsNotEmpty" after="getSecondOrderId">
-			<actualResult type="const">$getSecondOrderId</actualResult>
-        </assertNotEmpty> -->
-
-        <!-- Create CreditMemo for second Order -->
-        <!-- <actionGroup ref="AdminCreateInvoiceAndCreditMemoActionGroup" stepKey="createCreditMemo"/> -->
-
-        <!-- <actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="openOrderOne">
-            <argument name="entityId" value="$createGuestCartOne.return$"/>
-        </actionGroup>
-        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderOneId"/>
-
-        <actionGroup ref="AdminOpenOrderByEntityIdActionGroup" stepKey="openOrderTwo">
-            <argument name="entityId" value="$createGuestCartTwo.return$"/>
-        </actionGroup> -->
-      
-        <!-- Navigate to backend: Go to Sales > Orders -->
         <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
 
         <grabTextFrom selector="{{AdminOrdersGridSection.orderIdByIncrementId($createGuestCartOne.return$)}}" stepKey="getOrderOneId"/>
         <grabTextFrom selector="{{AdminOrdersGridSection.orderIdByIncrementId($createGuestCartTwo.return$)}}" stepKey="getOrderTwoId"/>
 
-        <!-- Select Mass Action according to dataset: Cancel -->
         <actionGroup ref="AdminTwoOrderActionOnGridActionGroup" stepKey="massActionCancel">
             <argument name="action" value="Cancel"/>
             <argument name="orderId" value="$getOrderOneId"/>
             <argument name="secondOrderId" value="$getOrderTwoId"/>
         </actionGroup>
         <see userInput="You cannot cancel the order(s)." stepKey="assertOrderCancelMassActionFailMessage"/>
 
-        <!--Assert first order in orders grid -->
         <actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeFirstOrder">
             <argument name="orderId" value="$getOrderOneId"/>
             <argument name="orderStatus" value="Complete"/>
         </actionGroup>
         <see userInput="$getOrderOneId" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertFirstOrderID"/>
         <see userInput="Complete" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertFirstOrderStatus"/>
 
-        <!--Assert second order in orders grid -->
         <actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeSecondOrder">
             <argument name="orderId" value="$getOrderTwoId"/>
             <argument name="orderStatus" value="Closed"/>