ACP2E-4001: Cancel invoice redirects to 404

Author: veloraven

app/code/Magento/Paypal/Test/Mftf/Test/AdminPayPalExpressCheckoutCancelInvoiceNotCaptureTest.xml

@@ -72,12 +72,9 @@
         <grabTextFrom selector="{{AdminOrderPaymentInformationSection.paymentInformationField('Last Transaction ID')}}" stepKey="grabTransactionID"/>
         <waitForText selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$15.00" stepKey="checkGrandTotal"/>
         <!-- Create invoice with not capture amount -->
-        <waitForElementVisible selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="waitForInvoicebtn"/>
         <actionGroup ref="AdminCreateInvoiceNotCaptureActionGroup" stepKey="createInvoiceNotCapture"/>
         <!-- Open invoice and cancel it -->
         <actionGroup ref="AdminOpenInvoiceFromOrderPageActionGroup" stepKey="openInvoiceFromOrderPage"/>
         <actionGroup ref="AdminClickCancelButtonInInvoiceActionGroup" stepKey="clickCancelInvoiceButton"/>
-        <waitForPageLoad stepKey="waitForLoadPage2"/>
-        <waitForText userInput="You canceled the invoice." stepKey="seeMessageInvoiceCanceled"/>
     </test>
 </tests>

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

@@ -14,5 +14,7 @@
         </annotations>
         <waitForElementClickable selector="{{AdminInvoiceMainActionsSection.cancel}}" stepKey="waitForHoldButtonToBeClickable"/>
         <click selector="{{AdminInvoiceMainActionsSection.cancel}}" stepKey="clickCancelButton"/>
+        <waitForPageLoad stepKey="waitForLoadPage2"/>
+        <waitForText userInput="You canceled the invoice." stepKey="seeMessageInvoiceCanceled"/>
     </actionGroup>
 </actionGroups>

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

@@ -8,14 +8,10 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminCreateInvoiceNotCaptureActionGroup">
-        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
-        <waitForPageLoad stepKey="waitForInvoicePage"/>
-        <scrollTo selector="{{AdminInvoiceMainActionsSection.selectModeOfAmount}}" x="0" y="-80" stepKey="scrollToAmount"/>
-        <selectOption userInput="Not Capture" selector="{{AdminInvoiceMainActionsSection.selectModeOfAmount}}" stepKey="selectNotCaptureUnderAmount"/>
-        <waitForElementVisible selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="waitForSubmitInvoicebtn"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="submitInvoice"/>
-        <waitForPageLoad stepKey="waitForLoadPage"/>
-        <waitForText userInput="The invoice has been created." stepKey="seeMessageInvoiceCreated"/>
+    <actionGroup name="AdminCreateInvoiceNotCaptureActionGroup" extends="AdminCreateInvoiceActionGroup">
+        <waitForElementVisible selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="waitForInvoiceButton" before="clickInvoice"/>
+        <scrollTo selector="{{AdminInvoiceMainActionsSection.selectModeOfAmount}}" x="0" y="-80" stepKey="scrollToAmount" after="waitForInvoicePage"/>
+        <selectOption userInput="Not Capture" selector="{{AdminInvoiceMainActionsSection.selectModeOfAmount}}" stepKey="selectNotCaptureUnderAmount" after="scrollToAmount"/>
+        <waitForElementVisible selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="waitForSubmitInvoicebtn" after="selectNotCaptureUnderAmount"/>
     </actionGroup>
 </actionGroups>