From edd413b6001cafe300510c81e58b6c4384cd76ad Mon Sep 17 00:00:00 2001
From: Medvediev <v.medvediev@atwix.com>
Date: Wed, 24 Feb 2021 15:32:56 +0200
Subject: [PATCH] Fixed tests to compatibility to order increment_id wih prefix

---
 ...undFullInvoiceFullShipmentBundleProductDefaultStockTest.xml | 3 ++-
 ...FullInvoicePartialShipmentBundleProductDefaultStockTest.xml | 3 ++-
 ...uctOnDefaultStockAfterFullInvoiceAndShipmentInAdminTest.xml | 3 ++-
 ...ProductOnDefaultStockAfterFullInvoiceAndPartialShipment.xml | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoiceFullShipmentBundleProductDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoiceFullShipmentBundleProductDefaultStockTest.xml
index 7e2b99b374b2..fade14d38cd0 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoiceFullShipmentBundleProductDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoiceFullShipmentBundleProductDefaultStockTest.xml
@@ -92,11 +92,12 @@
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrder">
             <argument name="orderId" value="{$orderNumber}"/>
         </actionGroup>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="getOrderIdFromUrl"/>
         <actionGroup ref="AdminShipThePendingOrderActionGroup" stepKey="createShipment"/>
         <actionGroup ref="AdminCreateInvoiceActionGroup" stepKey="createInvoice"/>
         <!--Process credit memo partial refund.-->
         <actionGroup ref="StartToCreateCreditMemoActionGroup" stepKey="startToCreateCreditMemo">
-            <argument name="orderId" value="{$orderNumber}"/>
+            <argument name="orderId" value="{$getOrderIdFromUrl}"/>
         </actionGroup>
         <fillField selector="{{AdminCreditMemoItemsSection.itemQtyToRefund('1')}}" userInput="{{fivePiecesAddToCart.value}}" stepKey="partialRefund"/>
         <click selector="{{AdminCreditMemoItemsSection.updateQty}}" stepKey="updateQuantityToRefund"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoicePartialShipmentBundleProductDefaultStockTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoicePartialShipmentBundleProductDefaultStockTest.xml
index 66ebae742542..4afc87fed524 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoicePartialShipmentBundleProductDefaultStockTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundFullInvoicePartialShipmentBundleProductDefaultStockTest.xml
@@ -92,13 +92,14 @@
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrder">
             <argument name="orderId" value="{$orderNumber}"/>
         </actionGroup>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="getOrderIdFromUrl"/>
         <actionGroup ref="AdminCreateInvoiceActionGroup" stepKey="createInvoice"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
         <fillField selector=".order-shipment-table tbody:nth-of-type(1) .col-qty input" userInput="{{fivePiecesAddToCart.value}}" stepKey="shipFiveItems"/>
         <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
         <!--Process credit memo partial refund.-->
         <actionGroup ref="StartToCreateCreditMemoActionGroup" stepKey="startToCreateCreditMemo">
-            <argument name="orderId" value="{$orderNumber}"/>
+            <argument name="orderId" value="{$getOrderIdFromUrl}"/>
         </actionGroup>
         <fillField selector="{{AdminCreditMemoItemsSection.itemQtyToRefund('1')}}" userInput="{{fivePiecesAddToCart.value}}" stepKey="partialRefund"/>
         <click selector="{{AdminCreditMemoItemsSection.updateQty}}" stepKey="updateQuantityToRefund"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreditMemoCreatedForWholeOrderWithSimpleProductOnDefaultStockAfterFullInvoiceAndShipmentInAdminTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreditMemoCreatedForWholeOrderWithSimpleProductOnDefaultStockAfterFullInvoiceAndShipmentInAdminTest.xml
index 52076a0b0703..8cfd38ead9a8 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreditMemoCreatedForWholeOrderWithSimpleProductOnDefaultStockAfterFullInvoiceAndShipmentInAdminTest.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreditMemoCreatedForWholeOrderWithSimpleProductOnDefaultStockAfterFullInvoiceAndShipmentInAdminTest.xml
@@ -71,13 +71,14 @@
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrderToCreateShipment">
             <argument name="orderId" value="{$orderNumber}"/>
         </actionGroup>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="getOrderIdFromUrl"/>
         <actionGroup ref="AdminShipThePendingOrderActionGroup" stepKey="shipOrder"/>
         <!--Admin Area Process Full Invoice-->
         <actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="startCreateInvoice"/>
         <actionGroup ref="SubmitInvoiceActionGroup" stepKey="submitInvoice"/>
         <!--Admin Area Create Full Credit Memo-->
         <actionGroup ref="StartToCreateCreditMemoActionGroup" stepKey="startToCreateCreditMemo">
-            <argument name="orderId" value="{$orderNumber}"/>
+            <argument name="orderId" value="{$getOrderIdFromUrl}"/>
         </actionGroup>
         <click selector="{{AdminCreditMemoItemsSection.itemReturnToStock('1')}}" stepKey="returnToStockCheckbox"/>
         <actionGroup ref="SubmitCreditMemoActionGroup" stepKey="submitCreditMemo"/>
diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminCreditMemoCreatedWithFullRefundWithSimpleProductOnDefaultStockAfterFullInvoiceAndPartialShipment.xml b/InventoryAdminUi/Test/Mftf/Test/AdminCreditMemoCreatedWithFullRefundWithSimpleProductOnDefaultStockAfterFullInvoiceAndPartialShipment.xml
index 93701ea6369c..752b31e91248 100644
--- a/InventoryAdminUi/Test/Mftf/Test/AdminCreditMemoCreatedWithFullRefundWithSimpleProductOnDefaultStockAfterFullInvoiceAndPartialShipment.xml
+++ b/InventoryAdminUi/Test/Mftf/Test/AdminCreditMemoCreatedWithFullRefundWithSimpleProductOnDefaultStockAfterFullInvoiceAndPartialShipment.xml
@@ -81,11 +81,12 @@
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrderToCreateInvoice">
             <argument name="orderId" value="{$orderNumber}"/>
         </actionGroup>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="getOrderIdFromUrl"/>
         <actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="startCreateInvoice"/>
         <actionGroup ref="SubmitInvoiceActionGroup" stepKey="submitInvoice"/>
         <!--Admin Area Create Full Credit Memo-->
         <actionGroup ref="StartToCreateCreditMemoActionGroup" stepKey="startToCreateCreditMemo">
-            <argument name="orderId" value="{$orderNumber}"/>
+            <argument name="orderId" value="{$getOrderIdFromUrl}"/>
         </actionGroup>
         <click selector="{{AdminCreditMemoItemsSection.itemReturnToStock('1')}}" stepKey="returnToStockCheckbox"/>
         <actionGroup ref="SubmitCreditMemoActionGroup" stepKey="submitCreditMemo"/>