From 9847f03d47e5027c7f27c4e5c800896a5b199582 Mon Sep 17 00:00:00 2001 From: Anna Pak Date: Tue, 1 Dec 2020 11:47:05 +0200 Subject: [PATCH 01/12] init --- .../Sales/Test/Mftf/Metadata/InvoiceMeta.xml | 14 +++++ .../Test/Mftf/Test/AdminCreateInvoice.xml | 53 +++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml diff --git a/app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml b/app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml new file mode 100644 index 0000000000000..30355882b20df --- /dev/null +++ b/app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml @@ -0,0 +1,14 @@ + + + + + + application/json + + diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml new file mode 100644 index 0000000000000..74912e1037436 --- /dev/null +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml @@ -0,0 +1,53 @@ + + + + + + + + + + <description value="1Admin should be able to create an invoice"/> + <severity value="MAJOR"/> + <testCaseId value="1MAGETWO-72096"/> + <group value="sales"/> + </annotations> + <before> + <createData entity="ApiCategory" stepKey="createCategory"/> + + <createData entity="defaultSimpleProduct" stepKey="createConfigProduct"> + <requiredEntity createDataKey="createCategory"/> + </createData> + + <createData entity="GuestCart" stepKey="createGuestCart"/> + <createData entity="SimpleCartItem" stepKey="addCartItem"> + <requiredEntity createDataKey="createGuestCart"/> + <requiredEntity createDataKey="createConfigProduct"/> + </createData> + <createData entity="GuestAddressInformation" stepKey="addGuestOrderAddress"> + <requiredEntity createDataKey="createGuestCart"/> + </createData> + <updateData createDataKey="createGuestCart" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformation"> + <requiredEntity createDataKey="createGuestCart"/> + </updateData> + + <createData entity="Invoice" stepKey="invoiceOrder"/> + + + </before> + <after> + <!-- <deleteData createDataKey="createCategory" stepKey="deleteCategory"/> + <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/> --> + <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/> + </after> + + <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> + + </test> +</tests> From e34fc7826d04dcd7e504082d5fa0d7f029343225 Mon Sep 17 00:00:00 2001 From: Anna Pak <a.pak@atwix.com> Date: Tue, 1 Dec 2020 13:10:44 +0200 Subject: [PATCH 02/12] ready --- app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml | 7 ++++++- .../Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml b/app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml index 30355882b20df..250d657c123ff 100644 --- a/app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml +++ b/app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml @@ -8,7 +8,12 @@ <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd"> - <operation name="CreateInvoice" dataType="Invoice" type="create" auth="adminOauth" url="V1/order/29/invoices" method="POST"> + <operation name="CreateInvoice" dataType="Invoice" type="create" auth="adminOauth" url="V1/order/{return}/invoice" method="POST"> <contentType>application/json</contentType> + <object key="cartItem" dataType="CartItem"> + <field key="quote_id">string</field> + <field key="sku" type="string">string</field> + <field key="qty">integer</field> + </object> </operation> </operations> diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml index 74912e1037436..b75be4652c483 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml @@ -37,8 +37,9 @@ <requiredEntity createDataKey="createGuestCart"/> </updateData> - <createData entity="Invoice" stepKey="invoiceOrder"/> - + <createData entity="Invoice" stepKey="invoiceOrder"> + <requiredEntity createDataKey="createGuestCart"/> + </createData> </before> <after> From beb0fda08417c7dfec5063a1335639cb356cd9f2 Mon Sep 17 00:00:00 2001 From: Anna Pak <a.pak@atwix.com> Date: Tue, 1 Dec 2020 13:19:17 +0200 Subject: [PATCH 03/12] refactored --- app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml | 2 -- app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml b/app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml index 250d657c123ff..e0bbfa1cd6e5f 100644 --- a/app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml +++ b/app/code/Magento/Sales/Test/Mftf/Metadata/InvoiceMeta.xml @@ -12,8 +12,6 @@ <contentType>application/json</contentType> <object key="cartItem" dataType="CartItem"> <field key="quote_id">string</field> - <field key="sku" type="string">string</field> - <field key="qty">integer</field> </object> </operation> </operations> diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml index b75be4652c483..51aaa251fa3d9 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml @@ -43,8 +43,8 @@ </before> <after> - <!-- <deleteData createDataKey="createCategory" stepKey="deleteCategory"/> - <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/> --> + <deleteData createDataKey="createCategory" stepKey="deleteCategory"/> + <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/> <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/> </after> From 320748f555d4036d50ed83ebb32a81972aa29579 Mon Sep 17 00:00:00 2001 From: Anna Pak <a.pak@atwix.com> Date: Tue, 1 Dec 2020 13:45:26 +0200 Subject: [PATCH 04/12] added Shipment, CreditMemo --- .../Sales/Test/Mftf/Data/CreditMemoData.xml | 17 +++++++++++++++++ .../Sales/Test/Mftf/Data/InvoiceData.xml | 17 +++++++++++++++++ .../Sales/Test/Mftf/Data/ShipmentData.xml | 17 +++++++++++++++++ .../Sales/Test/Mftf/Metadata/CreditMemoMeta.xml | 17 +++++++++++++++++ .../Sales/Test/Mftf/Metadata/ShipmentMeta.xml | 17 +++++++++++++++++ .../Sales/Test/Mftf/Test/AdminCreateInvoice.xml | 10 +++++++++- 6 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 app/code/Magento/Sales/Test/Mftf/Data/CreditMemoData.xml create mode 100644 app/code/Magento/Sales/Test/Mftf/Data/InvoiceData.xml create mode 100644 app/code/Magento/Sales/Test/Mftf/Data/ShipmentData.xml create mode 100644 app/code/Magento/Sales/Test/Mftf/Metadata/CreditMemoMeta.xml create mode 100644 app/code/Magento/Sales/Test/Mftf/Metadata/ShipmentMeta.xml diff --git a/app/code/Magento/Sales/Test/Mftf/Data/CreditMemoData.xml b/app/code/Magento/Sales/Test/Mftf/Data/CreditMemoData.xml new file mode 100644 index 0000000000000..dc6280f7b3444 --- /dev/null +++ b/app/code/Magento/Sales/Test/Mftf/Data/CreditMemoData.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd"> + + <entity name="CreditMemo" type="CreditMemo"> + <var key="quote_id" entityKey="return" entityType="CustomerCart"/> + </entity> + +</entities> diff --git a/app/code/Magento/Sales/Test/Mftf/Data/InvoiceData.xml b/app/code/Magento/Sales/Test/Mftf/Data/InvoiceData.xml new file mode 100644 index 0000000000000..b55ef96932100 --- /dev/null +++ b/app/code/Magento/Sales/Test/Mftf/Data/InvoiceData.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd"> + + <entity name="Invoice" type="Invoice"> + <var key="quote_id" entityKey="return" entityType="CustomerCart"/> + </entity> + +</entities> diff --git a/app/code/Magento/Sales/Test/Mftf/Data/ShipmentData.xml b/app/code/Magento/Sales/Test/Mftf/Data/ShipmentData.xml new file mode 100644 index 0000000000000..96d371d3aaf3a --- /dev/null +++ b/app/code/Magento/Sales/Test/Mftf/Data/ShipmentData.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd"> + + <entity name="Shipment" type="Shipment"> + <var key="quote_id" entityKey="return" entityType="CustomerCart"/> + </entity> + +</entities> diff --git a/app/code/Magento/Sales/Test/Mftf/Metadata/CreditMemoMeta.xml b/app/code/Magento/Sales/Test/Mftf/Metadata/CreditMemoMeta.xml new file mode 100644 index 0000000000000..3b500d61b1c35 --- /dev/null +++ b/app/code/Magento/Sales/Test/Mftf/Metadata/CreditMemoMeta.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd"> + <operation name="CreateCreditMemo" dataType="CreditMemo" type="create" auth="adminOauth" url="V1/order/{return}/refund" method="POST"> + <contentType>application/json</contentType> + <object key="cartItem" dataType="CartItem"> + <field key="quote_id">string</field> + </object> + </operation> +</operations> diff --git a/app/code/Magento/Sales/Test/Mftf/Metadata/ShipmentMeta.xml b/app/code/Magento/Sales/Test/Mftf/Metadata/ShipmentMeta.xml new file mode 100644 index 0000000000000..1c9de02c6a2e7 --- /dev/null +++ b/app/code/Magento/Sales/Test/Mftf/Metadata/ShipmentMeta.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd"> + <operation name="CreateShipment" dataType="Shipment" type="create" auth="adminOauth" url="V1/order/{return}/ship" method="POST"> + <contentType>application/json</contentType> + <object key="cartItem" dataType="CartItem"> + <field key="quote_id">string</field> + </object> + </operation> +</operations> diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml index 51aaa251fa3d9..3dc1c3ed98d03 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml @@ -35,10 +35,18 @@ </createData> <updateData createDataKey="createGuestCart" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformation"> <requiredEntity createDataKey="createGuestCart"/> - </updateData> + </updateData> <createData entity="Invoice" stepKey="invoiceOrder"> <requiredEntity createDataKey="createGuestCart"/> + </createData> + + <createData entity="Shipment" stepKey="shipOrder"> + <requiredEntity createDataKey="createGuestCart"/> + </createData> + + <createData entity="CreditMemo" stepKey="refundMemo"> + <requiredEntity createDataKey="createGuestCart"/> </createData> </before> From d2ab2f389d64d349dca0ddc3246654c94c806cc3 Mon Sep 17 00:00:00 2001 From: Anna Pak <a.pak@atwix.com> Date: Tue, 1 Dec 2020 14:25:38 +0200 Subject: [PATCH 05/12] AdminCancelTheOrderWithCashOnDeliveryPaymentMethodTest refactoring (in progress) --- .../Quote/Test/Mftf/Data/CustomerCartData.xml | 7 + ...ssOrdersCancelCompleteAndClosedAPITest.xml | 134 ++++++++++++++++++ ...nMassOrdersCancelCompleteAndClosedTest.xml | 7 +- 3 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml diff --git a/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml b/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml index a14be3b533fa8..affebbc07ad61 100755 --- a/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml +++ b/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml @@ -24,4 +24,11 @@ <requiredEntity type="payment_method">PaymentMethodCheckMoneyOrder</requiredEntity> <requiredEntity type="billing_address">BillingAddressTX</requiredEntity> </entity> + + <entity name="CustomerOrderPaymentMethod" type="CustomerPaymentInformation"> + <var key="cart_id" entityKey="return" entityType="CustomerCart"/> + <requiredEntity type="payment_method">PaymentMethodCheckMoneyOrder</requiredEntity> + <requiredEntity type="billing_address">BillingAddressTX</requiredEntity> + </entity> + </entities> diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml new file mode 100644 index 0000000000000..5ed660b21c6df --- /dev/null +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml @@ -0,0 +1,134 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> + <test name="AdminMassOrdersCancelCompleteAndClosedAPITest"> + <annotations> + <stories value="Mass Update Orders"/> + <title value="Mass cancel orders in status Complete, Closed"/> + <description value="Try to cancel orders in status Complete, Closed"/> + <severity value="MAJOR"/> + <testCaseId value="MC-16183"/> + <group value="sales"/> + <group value="mtf_migrated"/> + </annotations> + <before> + <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/> + + <createData entity="ApiCategory" stepKey="createCategory"/> + + <createData entity="defaultSimpleProduct" stepKey="createSimpleProduct"> + <requiredEntity createDataKey="createCategory"/> + </createData> + + <createData entity="GuestCart" stepKey="createGuestCartOne"/> + <createData entity="SimpleCartItem" stepKey="addCartItemOne"> + <requiredEntity createDataKey="createGuestCartOne"/> + <requiredEntity createDataKey="createSimpleProduct"/> + </createData> + <createData entity="GuestAddressInformation" stepKey="addGuestOrderAddressOne"> + <requiredEntity createDataKey="createGuestCartOne"/> + </createData> + <updateData createDataKey="createGuestCartOne" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformationOne"> + <requiredEntity createDataKey="createGuestCartOne"/> + </updateData> + + <createData entity="Invoice" stepKey="invoiceOrderOne"> + <requiredEntity createDataKey="createGuestCartOne"/> + </createData> + + <createData entity="Shipment" stepKey="shipOrderOne"> + <requiredEntity createDataKey="createGuestCartOne"/> + </createData> + + + <createData entity="GuestCart" stepKey="createGuestCartTwo"/> + <createData entity="SimpleCartItem" stepKey="addCartItemTwo"> + <requiredEntity createDataKey="createGuestCartTow"/> + <requiredEntity createDataKey="createSimpleProduct"/> + </createData> + <createData entity="GuestAddressInformation" stepKey="addGuestOrderAddressTwo"> + <requiredEntity createDataKey="createGuestCartTwo"/> + </createData> + <updateData createDataKey="createGuestCartTwo" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformationTwo"> + <requiredEntity createDataKey="createGuestCartTwo"/> + </updateData> + + <createData entity="Invoice" stepKey="invoiceOrderTwo"> + <requiredEntity createDataKey="createGuestCartTwo"/> + </createData> + + <createData entity="CreditMemo" stepKey="refundOrderTwo"> + <requiredEntity createDataKey="createGuestCartTwo"/> + </createData> + + </before> + <after> + <!-- Delete data --> + <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/> + <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"/> --> + + <!-- Navigate to backend: Go to Sales > Orders --> + <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/> + <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/> + + <!-- Select Mass Action according to dataset: Cancel --> + <actionGroup ref="AdminTwoOrderActionOnGridActionGroup" stepKey="massActionCancel"> + <argument name="action" value="Cancel"/> + <argument name="orderId" value="$createGuestCartOne.return$"/> + <argument name="secondOrderId" value="$createGuestCartTwo.return$"/> + </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="$createGuestCartOne.return$"/> + <argument name="orderStatus" value="Complete"/> + </actionGroup> + <see userInput="$createGuestCartOne.return$" 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="$createGuestCartTwo.return$"/> + <argument name="orderStatus" value="Closed"/> + </actionGroup> + <see userInput="$createGuestCartTwo.return$" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertSecondOrderID"/> + <see userInput="Closed" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertSecondStatus"/> + </test> +</tests> diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml index b337af3753db3..793e1a07950c9 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml @@ -8,15 +8,18 @@ <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> - <test name="AdminMassOrdersCancelCompleteAndClosedTest"> + <test name="AdminMassOrdersCancelCompleteAndClosedTest" deprecated="Use AdminMassOrdersCancelCompleteAndClosedAPITest instead"> <annotations> <stories value="Mass Update Orders"/> - <title value="Mass cancel orders in status Complete, Closed"/> + <title value="DEPRECATED. Mass cancel orders in status Complete, Closed"/> <description value="Try to cancel orders in status Complete, Closed"/> <severity value="MAJOR"/> <testCaseId value="MC-16183"/> <group value="sales"/> <group value="mtf_migrated"/> + <skip> + <issueId value="DEPRECATED">Use AdminMassOrdersCancelCompleteAndClosedAPITest instead</issueId> + </skip> </annotations> <before> <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/> From 7dcd88bd75b83a0a7016b36738462a2e256d8d20 Mon Sep 17 00:00:00 2001 From: Anna Pak <a.pak@atwix.com> Date: Wed, 2 Dec 2020 10:38:58 +0200 Subject: [PATCH 06/12] added selector AdminOrdersGridSection.orderIdByIncrementId Please enter the commit message for your changes. Lines starting --- .../Mftf/Section/AdminOrdersGridSection.xml | 1 + .../Test/Mftf/Section/OrdersGridSection.xml | 1 + ...ssOrdersCancelCompleteAndClosedAPITest.xml | 27 +++++++++++++------ 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml index 02878e79f3d70..55cd30f1caf2e 100644 --- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml +++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml @@ -41,5 +41,6 @@ <element name="viewLink" type="text" selector="//td/div[contains(.,'{{orderID}}')]/../..//a[@class='action-menu-item']" parameterized="true"/> <element name="selectOrderID" type="checkbox" selector="//td/div[text()='{{orderId}}']/../preceding-sibling::td//input" parameterized="true" timeout="60"/> <element name="orderId" type="text" selector="//table[contains(@class, 'data-grid')]//div[contains(text(), '{{orderId}}')]" parameterized="true"/> + <element name="orderIdByIncrementId" type="text" selector="//input[@class='admin__control-checkbox' and @value={{incrId}}]/parent::label/parent::td/following-sibling::td" parameterized="true"/> </section> </sections> diff --git a/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml index a6b856f9f814f..02e11ec62e949 100644 --- a/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml +++ b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml @@ -30,5 +30,6 @@ <element name="removeItems" type="select" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td/select[@class='admin__control-select']" parameterized="true"/> <element name="applyCoupon" type="input" selector="#coupons:code"/> <element name="submitOrder" type="button" selector="#submit_order_top_button" timeout="60"/> + </section> </sections> diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml index 5ed660b21c6df..e0ecab5947bfb 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml @@ -50,7 +50,7 @@ <createData entity="GuestCart" stepKey="createGuestCartTwo"/> <createData entity="SimpleCartItem" stepKey="addCartItemTwo"> - <requiredEntity createDataKey="createGuestCartTow"/> + <requiredEntity createDataKey="createGuestCartTwo"/> <requiredEntity createDataKey="createSimpleProduct"/> </createData> <createData entity="GuestAddressInformation" stepKey="addGuestOrderAddressTwo"> @@ -71,7 +71,6 @@ </before> <after> <!-- Delete data --> - <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/> <deleteData createDataKey="createCategory" stepKey="deleteCategory"/> <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/> <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> @@ -103,32 +102,44 @@ <!-- 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="$createGuestCartOne.return$"/> - <argument name="secondOrderId" value="$createGuestCartTwo.return$"/> + <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="$createGuestCartOne.return$"/> + <argument name="orderId" value="$getOrderOneId"/> <argument name="orderStatus" value="Complete"/> </actionGroup> - <see userInput="$createGuestCartOne.return$" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertFirstOrderID"/> + <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="$createGuestCartTwo.return$"/> + <argument name="orderId" value="$getOrderTwoId"/> <argument name="orderStatus" value="Closed"/> </actionGroup> - <see userInput="$createGuestCartTwo.return$" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertSecondOrderID"/> + <see userInput="$getOrderTwoId" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertSecondOrderID"/> <see userInput="Closed" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertSecondStatus"/> </test> </tests> From 732c6ff48720740fa0e399f2b1d85b198dd41c9e Mon Sep 17 00:00:00 2001 From: Anna Pak <a.pak@atwix.com> Date: Wed, 2 Dec 2020 12:07:37 +0200 Subject: [PATCH 07/12] refactored --- ...ssOrdersCancelCompleteAndClosedAPITest.xml | 42 +------------------ 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml index e0ecab5947bfb..85f2fde4d1871 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml +++ b/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,56 +68,19 @@ </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"/> @@ -126,7 +88,6 @@ </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"/> @@ -134,7 +95,6 @@ <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"/> From a70dfc91c5842aa8ae497912ac91ca2ca93f5020 Mon Sep 17 00:00:00 2001 From: Anna Pak <a.pak@atwix.com> Date: Wed, 2 Dec 2020 12:27:56 +0200 Subject: [PATCH 08/12] refactored --- .../Quote/Test/Mftf/Data/CustomerCartData.xml | 6 -- .../Test/Mftf/Metadata/CreditMemoMeta.xml | 2 +- .../Test/Mftf/Section/OrdersGridSection.xml | 1 - .../Test/Mftf/Test/AdminCreateInvoice.xml | 62 ------------------- ...ssOrdersCancelCompleteAndClosedAPITest.xml | 2 + 5 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml diff --git a/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml b/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml index affebbc07ad61..8c76c4d0dc31a 100755 --- a/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml +++ b/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml @@ -25,10 +25,4 @@ <requiredEntity type="billing_address">BillingAddressTX</requiredEntity> </entity> - <entity name="CustomerOrderPaymentMethod" type="CustomerPaymentInformation"> - <var key="cart_id" entityKey="return" entityType="CustomerCart"/> - <requiredEntity type="payment_method">PaymentMethodCheckMoneyOrder</requiredEntity> - <requiredEntity type="billing_address">BillingAddressTX</requiredEntity> - </entity> - </entities> diff --git a/app/code/Magento/Sales/Test/Mftf/Metadata/CreditMemoMeta.xml b/app/code/Magento/Sales/Test/Mftf/Metadata/CreditMemoMeta.xml index 3b500d61b1c35..b051c91ba3b10 100644 --- a/app/code/Magento/Sales/Test/Mftf/Metadata/CreditMemoMeta.xml +++ b/app/code/Magento/Sales/Test/Mftf/Metadata/CreditMemoMeta.xml @@ -11,7 +11,7 @@ <operation name="CreateCreditMemo" dataType="CreditMemo" type="create" auth="adminOauth" url="V1/order/{return}/refund" method="POST"> <contentType>application/json</contentType> <object key="cartItem" dataType="CartItem"> - <field key="quote_id">string</field> + <field key="quote_id">string</field> </object> </operation> </operations> diff --git a/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml index 02e11ec62e949..a6b856f9f814f 100644 --- a/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml +++ b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml @@ -30,6 +30,5 @@ <element name="removeItems" type="select" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td/select[@class='admin__control-select']" parameterized="true"/> <element name="applyCoupon" type="input" selector="#coupons:code"/> <element name="submitOrder" type="button" selector="#submit_order_top_button" timeout="60"/> - </section> </sections> diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml deleted file mode 100644 index 3dc1c3ed98d03..0000000000000 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoice.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ ---> - -<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> - <test name="AdminCreateInvoice"> - <annotations> - <features value="Sales"/> - <stories value="1Create an Invoice via the Admin"/> - <title value="1111Admin should be able to create an invoice"/> - <description value="1Admin should be able to create an invoice"/> - <severity value="MAJOR"/> - <testCaseId value="1MAGETWO-72096"/> - <group value="sales"/> - </annotations> - <before> - <createData entity="ApiCategory" stepKey="createCategory"/> - - <createData entity="defaultSimpleProduct" stepKey="createConfigProduct"> - <requiredEntity createDataKey="createCategory"/> - </createData> - - <createData entity="GuestCart" stepKey="createGuestCart"/> - <createData entity="SimpleCartItem" stepKey="addCartItem"> - <requiredEntity createDataKey="createGuestCart"/> - <requiredEntity createDataKey="createConfigProduct"/> - </createData> - <createData entity="GuestAddressInformation" stepKey="addGuestOrderAddress"> - <requiredEntity createDataKey="createGuestCart"/> - </createData> - <updateData createDataKey="createGuestCart" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformation"> - <requiredEntity createDataKey="createGuestCart"/> - </updateData> - - <createData entity="Invoice" stepKey="invoiceOrder"> - <requiredEntity createDataKey="createGuestCart"/> - </createData> - - <createData entity="Shipment" stepKey="shipOrder"> - <requiredEntity createDataKey="createGuestCart"/> - </createData> - - <createData entity="CreditMemo" stepKey="refundMemo"> - <requiredEntity createDataKey="createGuestCart"/> - </createData> - - </before> - <after> - <deleteData createDataKey="createCategory" stepKey="deleteCategory"/> - <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/> - <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/> - </after> - - <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/> - - </test> -</tests> diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml index 85f2fde4d1871..5cb54f0fd5613 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml @@ -18,7 +18,9 @@ <group value="sales"/> <group value="mtf_migrated"/> </annotations> + <before> + <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/> <createData entity="ApiCategory" stepKey="createCategory"/> From a5dd5e99039e17705a42297b14a9a40fcd11d96f Mon Sep 17 00:00:00 2001 From: Anna Pak <a.pak@atwix.com> Date: Wed, 2 Dec 2020 12:29:18 +0200 Subject: [PATCH 09/12] refactored --- app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml b/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml index 8c76c4d0dc31a..a14be3b533fa8 100755 --- a/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml +++ b/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml @@ -24,5 +24,4 @@ <requiredEntity type="payment_method">PaymentMethodCheckMoneyOrder</requiredEntity> <requiredEntity type="billing_address">BillingAddressTX</requiredEntity> </entity> - </entities> From 424754fe4bc2acec733f6bc9736afde5232553c7 Mon Sep 17 00:00:00 2001 From: Anna Pak <a.pak@atwix.com> Date: Fri, 4 Dec 2020 18:27:06 +0200 Subject: [PATCH 10/12] changed naming --- ...ITest.xml => AdminMassOrdersCancelClosedAndCompleteTest.xml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename app/code/Magento/Sales/Test/Mftf/Test/{AdminMassOrdersCancelCompleteAndClosedAPITest.xml => AdminMassOrdersCancelClosedAndCompleteTest.xml} (98%) diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelClosedAndCompleteTest.xml similarity index 98% rename from app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml rename to app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelClosedAndCompleteTest.xml index 5cb54f0fd5613..a4f4e006837e1 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedAPITest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelClosedAndCompleteTest.xml @@ -8,7 +8,7 @@ <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> - <test name="AdminMassOrdersCancelCompleteAndClosedAPITest"> + <test name="AdminMassOrdersCancelClosedAndCompleteTest"> <annotations> <stories value="Mass Update Orders"/> <title value="Mass cancel orders in status Complete, Closed"/> From 035442d47019e7a82bc193787adce2086032f3a5 Mon Sep 17 00:00:00 2001 From: Anna Pak <a.pak@atwix.com> Date: Fri, 4 Dec 2020 18:27:58 +0200 Subject: [PATCH 11/12] updated deprecated test --- .../Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml index 793e1a07950c9..10b3ba05aa2bb 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml @@ -8,7 +8,7 @@ <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> - <test name="AdminMassOrdersCancelCompleteAndClosedTest" deprecated="Use AdminMassOrdersCancelCompleteAndClosedAPITest instead"> + <test name="AdminMassOrdersCancelCompleteAndClosedTest" deprecated="Use AdminMassOrdersCancelClosedAndCompleteTest instead"> <annotations> <stories value="Mass Update Orders"/> <title value="DEPRECATED. Mass cancel orders in status Complete, Closed"/> @@ -18,7 +18,7 @@ <group value="sales"/> <group value="mtf_migrated"/> <skip> - <issueId value="DEPRECATED">Use AdminMassOrdersCancelCompleteAndClosedAPITest instead</issueId> + <issueId value="DEPRECATED">Use AdminMassOrdersCancelClosedAndCompleteTest instead</issueId> </skip> </annotations> <before> From bc231ce31a22b9f8120d1a9542a066cbc61ba70a Mon Sep 17 00:00:00 2001 From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com> Date: Tue, 15 Dec 2020 09:56:53 +0200 Subject: [PATCH 12/12] updated testCaseId --- .../Mftf/Test/AdminMassOrdersCancelClosedAndCompleteTest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelClosedAndCompleteTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelClosedAndCompleteTest.xml index a4f4e006837e1..794d09226d87f 100644 --- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelClosedAndCompleteTest.xml +++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelClosedAndCompleteTest.xml @@ -14,7 +14,7 @@ <title value="Mass cancel orders in status Complete, Closed"/> <description value="Try to cancel orders in status Complete, Closed"/> <severity value="MAJOR"/> - <testCaseId value="MC-16183"/> + <testCaseId value="MC-39905"/> <group value="sales"/> <group value="mtf_migrated"/> </annotations>