Skip to content
This repository was archived by the owner on Dec 19, 2019. It is now read-only.

Commit 2346f71

Browse files
soumyausoumyau
authored
Merge pull request #116 from magento-pangolin/MC-4759
MC-4759
2 parents e867ece + d0468bf commit 2346f71

16 files changed

+781
-2
lines changed

‎app/code/Magento/CatalogInventory/Test/Mftf/Data/CatalogInventryConfigData.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="EnableCatalogInventoryConfigData">
12+
<!--Default Value -->
13+
<data key="path">cataloginventory/options/can_subtract</data>
14+
<data key="scope_id">0</data>
15+
<data key="label">Yes</data>
16+
<data key="value">1</data>
17+
</entity>
18+
<entity name="DisableCatalogInventoryConfigData">
19+
<data key="path">cataloginventory/options/can_subtract</data>
20+
<data key="scope_id">0</data>
21+
<data key="label">No</data>
22+
<data key="value">0</data>
23+
</entity>
24+
</entities>

‎app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<element name="printOrderLink" type="text" selector="a.action.print" timeout="30"/>
1717
<element name="shippingAddress" type="text" selector=".box.box-order-shipping-address"/>
1818
<element name="billingAddress" type="text" selector=".box.box-order-billing-address"/>
19+
<element name="orderStatusInGrid" type="text" selector="//td[contains(.,'{{orderId}}')]/../td[contains(.,'{{status}}')]" parameterized="true"/>
1920
<element name="pager" type="block" selector=".pager"/>
2021
</section>
2122
</sections>

‎app/code/Magento/Payment/Test/Mftf/Data/PaymentConfigData.xml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,41 @@
3232
<data key="label">No</data>
3333
<data key="value">0</data>
3434
</entity>
35-
<entity name="EnablePaymentCashOnDeliveryData">
35+
<entity name="EnableZeroSubtotalCheckoutConfigData">
36+
<!--Default Data-->
37+
<data key="path">payment/free/active</data>
38+
<data key="scope_id">0</data>
39+
<data key="label">Yes</data>
40+
<data key="value">1</data>
41+
</entity>
42+
<entity name="DisableZeroSubtotalCheckoutConfigData">
43+
<data key="path">payment/free/active</data>
44+
<data key="scope_id">0</data>
45+
<data key="label">No</data>
46+
<data key="value">0</data>
47+
</entity>
48+
<entity name="EnableCashOnDeliveryConfigData">
3649
<data key="path">payment/cashondelivery/active</data>
3750
<data key="scope_id">0</data>
3851
<data key="label">Yes</data>
3952
<data key="value">1</data>
4053
</entity>
41-
<entity name="DisablePaymentCashOnDeliveryData">
54+
<entity name="DisableCashOnDeliveryConfigData">
4255
<data key="path">payment/cashondelivery/active</data>
4356
<data key="scope_id">0</data>
4457
<data key="label">No</data>
4558
<data key="value">0</data>
4659
</entity>
60+
<entity name="EnablePurchaseOrderConfigData">
61+
<data key="path">payment/purchaseorder/active</data>
62+
<data key="scope_id">0</data>
63+
<data key="label">Yes</data>
64+
<data key="value">1</data>
65+
</entity>
66+
<entity name="DisablePurchaseOrderConfigData">
67+
<data key="path">payment/purchaseorder/active</data>
68+
<data key="scope_id">0</data>
69+
<data key="label">No</data>
70+
<data key="value">0</data>
71+
</entity>
4772
</entities>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,12 @@
141141
<click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
142142
</actionGroup>
143143

144+
<actionGroup name="newAddConfigurableProductToOrder" extends="addConfigurableProductToOrder">
145+
<remove keyForRemoval="waitForConfigurablePopover"/>
146+
<remove keyForRemoval="selectionConfigurableOption"/>
147+
<selectOption selector="{{AdminOrderFormConfigureProductSection.selectOption}}" userInput="{{option.value}}" stepKey="selectOption" after="waitForOptionsToLoad"/>
148+
</actionGroup>
149+
144150
<!--Add configurable product to order -->
145151
<actionGroup name="addConfigurableProductToOrderFromAdmin" extends="addConfigurableProductToOrder">
146152
<waitForElementVisible selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_frontend_label)}}" stepKey="waitForConfigurablePopover"/>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectFlatRateShippingMethodActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSelectFlatRateShippingMethodActionGroup">
12+
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
13+
<click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
14+
<waitForPageLoad stepKey="waitForShippingMethods"/>
15+
<click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
16+
<waitForPageLoad stepKey="waitForPageToLoad"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Data/PurchaseOrderNumberData.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="PurchaseOrderNumber">
12+
<data key="number" unique="suffix">PONumber</data>
13+
</entity>
14+
</entities>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormActionSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
<element name="submitOrder" type="button" selector="#submit_order_top_button" timeout="30"/>
1616
<element name="cancel" type="button" selector="#reset_order_top_button" timeout="30"/>
1717
<element name="createNewCustomer" type="button" selector="#order-customer-selector .actions button.primary" timeout="30"/>
18+
<element name="pageHeader" type="text" selector=".page-header.row"/>
1819
</section>
1920
</sections>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
<element name="optionSelect" type="select" selector="//div[contains(@class,'product-options')]/div/div/select[../../label[text() = '{{option}}']]" parameterized="true"/>
1313
<element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
1414
<element name="ok" type="button" selector=".modal-header .page-actions button[data-role='action']" timeout="30"/>
15+
<element name="selectOption" type="select" selector="//form[@id='product_composite_configure_form']//select"/>
1516
</section>
1617
</sections>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,9 @@
2323
<element name="fieldPurchaseOrderNumber" type="input" selector="#po_number"/>
2424
<element name="paymentBlock" type="text" selector="#order-billing_method" />
2525
<element name="paymentError" type="text" selector="#payment[method]-error"/>
26+
<element name="bankTransferOption" type="radio" selector="#p_method_banktransfer" timeout="30"/>
27+
<element name="cashOnDeliveryOption" type="radio" selector="#p_method_cashondelivery" timeout="30"/>
28+
<element name="purchaseOrderOption" type="radio" selector="#p_method_purchaseorder" timeout="30"/>
29+
<element name="purchaseOrderNumber" type="input" selector="#po_number"/>
2630
</section>
2731
</sections>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithBankTransferPaymentMethodTest.xml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminCancelTheCreatedOrderWithBankTransferPaymentMethodTest">
12+
<annotations>
13+
<group value="Sales"/>
14+
<stories value="Cancel Created Order"/>
15+
<title value="Cancel the created order with bank transfer payment method"/>
16+
<description value="Created an order with bank transfer payment method and cancel the order"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-16068"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
22+
<before>
23+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
25+
<!-- Enable Bank Transfer payment -->
26+
<magentoCLI command="config:set {{EnablePaymentBankTransferConfigData.path}} {{EnablePaymentBankTransferConfigData.value}}" stepKey="enableBankTransferPayment"/>
27+
28+
<!--Set default flat rate shipping method settings-->
29+
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
30+
31+
<!--Create simple customer-->
32+
<createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
33+
34+
<!-- Create Simple Product -->
35+
<createData entity="SimpleProduct2" stepKey="simpleProduct">
36+
<field key="price">10.00</field>
37+
</createData>
38+
</before>
39+
<after>
40+
<magentoCLI command="config:set {{DisablePaymentBankTransferConfigData.path}} {{DisablePaymentBankTransferConfigData.value}}" stepKey="disableBankTransferPayment"/>
41+
<deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
42+
<deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
43+
<actionGroup ref="logout" stepKey="logout"/>
44+
</after>
45+
46+
<!--Create new customer order-->
47+
<actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
48+
<argument name="customer" value="$$simpleCustomer$$"/>
49+
</actionGroup>
50+
51+
<!--Add Simple product to order-->
52+
<actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToTheOrder">
53+
<argument name="product" value="$$simpleProduct$$"/>
54+
</actionGroup>
55+
56+
<!--Select FlatRate shipping method-->
57+
<actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
58+
59+
<!-- Select bank Transfer payment method -->
60+
<waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
61+
<conditionalClick selector="{{AdminOrderFormPaymentSection.bankTransferOption}}" dependentSelector="{{AdminOrderFormPaymentSection.bankTransferOption}}" visible="true" stepKey="checkBankTransferOption"/>
62+
63+
<!-- Submit order -->
64+
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
65+
66+
<!-- Verify order information -->
67+
<actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
68+
<grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
69+
70+
<!-- Cancel the Order -->
71+
<actionGroup ref="cancelPendingOrder" stepKey="cancelPendingOrder"/>
72+
73+
<!--Log in to Storefront as Customer -->
74+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
75+
<argument name="Customer" value="$$simpleCustomer$$"/>
76+
</actionGroup>
77+
78+
<!-- Assert OrderId and status in frontend order grid -->
79+
<click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('My Orders')}}" stepKey="clickOnMyOrders"/>
80+
<waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
81+
<seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid('$orderId', 'Canceled')}}" stepKey="seeOrderStatusInGrid"/>
82+
</test>
83+
</tests>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest.xml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest">
12+
<annotations>
13+
<group value="Sales"/>
14+
<stories value="Cancel Created Order"/>
15+
<title value="Cancel the created order with cash on delivery payment method"/>
16+
<description value="Create an order with cash on delivery payment method and cancel the order"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-16069"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
22+
<before>
23+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
25+
<!-- Enable Cash On Delivery payment method -->
26+
<magentoCLI command="config:set {{EnableCashOnDeliveryConfigData.path}} {{EnableCashOnDeliveryConfigData.value}}" stepKey="enableCashOnDeliveryPayment"/>
27+
28+
<!--Set default flat rate shipping method settings-->
29+
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
30+
31+
<!--Create simple customer-->
32+
<createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
33+
34+
<!-- Create Simple Product -->
35+
<createData entity="SimpleProduct2" stepKey="simpleProduct">
36+
<field key="price">10.00</field>
37+
</createData>
38+
</before>
39+
<after>
40+
<magentoCLI command="config:set {{DisableCashOnDeliveryConfigData.path}} {{DisableCashOnDeliveryConfigData.value}}" stepKey="disableCashOnDeliveryPayment"/>
41+
<deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
42+
<deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
43+
<actionGroup ref="logout" stepKey="logout"/>
44+
</after>
45+
46+
<!-- Create new customer order -->
47+
<actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
48+
<argument name="customer" value="$$simpleCustomer$$"/>
49+
</actionGroup>
50+
51+
<!-- Add Simple product to order -->
52+
<actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToTheOrder">
53+
<argument name="product" value="$$simpleProduct$$"/>
54+
</actionGroup>
55+
56+
<!-- Select FlatRate shipping method -->
57+
<actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
58+
59+
<!-- Select Cash On Delivery payment method -->
60+
<waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
61+
<checkOption selector="{{AdminOrderFormPaymentSection.cashOnDeliveryOption}}" stepKey="selectCashOnDeliveryPaymentOption"/>
62+
63+
<!-- Submit order -->
64+
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
65+
66+
<!--Verify order information-->
67+
<actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
68+
<grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
69+
70+
<!-- Cancel the Order -->
71+
<actionGroup ref="cancelPendingOrder" stepKey="cancelPendingOrder"/>
72+
73+
<!--Log in to Storefront as Customer -->
74+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
75+
<argument name="Customer" value="$$simpleCustomer$$"/>
76+
</actionGroup>
77+
78+
<!-- Assert Order status in frontend grid -->
79+
<click selector="{{StorefrontCustomerSidebarSection.sidebarCurrentTab('My Orders')}}" stepKey="clickOnMyOrders"/>
80+
<waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
81+
<seeElement selector="{{StorefrontCustomerOrderViewSection.orderStatusInGrid('$orderId', 'Canceled')}}" stepKey="seeOrderStatusInGrid"/>
82+
</test>
83+
</tests>

0 commit comments

Comments
 (0)