Skip to content

Commit f837766

Browse files
tomreecetomreece
authored
Merge pull request #104 from magento-pangolin/MC-4760
MC-4760
2 parents 83af2be + 94ac590 commit f837766

29 files changed

+851
-9
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertOrderGraphImageOnDashboardActionGroup.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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="AssertOrderGraphImageOnDashboardActionGroup">
12+
<click selector="{{AdminDashboardSection.ordersTab}}" stepKey="clickOrdersBtn"/>
13+
<seeElement selector="{{AdminDashboardSection.ordersChart}}" stepKey="seeGraphImage"/>
14+
</actionGroup>
15+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
1111
<page name="AdminDashboardPage" url="admin/dashboard/" area="admin" module="Magento_Backend">
1212
<section name="AdminMenuSection"/>
13+
<section name="AdminDashboardSection"/>
1314
</page>
1415
</pages>

‎app/code/Magento/Backend/Test/Mftf/Section/AdminDashboardSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminDashboardSection">
12+
<element name="ordersTab" type="button" selector="#diagram_tab_orders"/>
13+
<element name="ordersChart" type="button" selector="#diagram_tab_orders_content .dashboard-diagram-image img"/>
1214
<element name="dashboardDiagramContent" type="button" selector="#diagram_tab_content"/>
1315
<element name="dashboardDiagramOrderContentTab" type="block" selector="#diagram_tab_orders_content"/>
1416
<element name="dashboardDiagramAmounts" type="button" selector="#diagram_tab_amounts"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<element name="productCustomOptions" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd[normalize-space(.)='{{var3}}']" parameterized="true"/>
1414
<element name="productCustomOptionsFile" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd[contains(.,'{{var3}}')]" parameterized="true"/>
1515
<element name="productCustomOptionsLink" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd//a[text() = '{{var3}}']" parameterized="true"/>
16+
<element name="viewOrder" type="button" selector="//td[contains(concat(' ',normalize-space(@class),' '),' col actions ')]/a[contains(concat(' ',normalize-space(@class),' '),' action view ')]"/>
1617
<element name="tabRefund" type="button" selector="//a[text()='Refunds']"/>
1718
<element name="grandTotalRefund" type="text" selector="td[data-th='Grand Total'] > strong > span.price"/>
1819
</section>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,38 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="BankTransferEnableConfigData">
1212
<data key="path">payment/banktransfer/active</data>
13-
<data key="scope_id">0</data>
13+
<data key="scope_id">1</data>
1414
<data key="label">Yes</data>
1515
<data key="value">1</data>
1616
</entity>
1717
<entity name="BankTransferDisabledConfigData">
1818
<data key="path">payment/banktransfer/active</data>
19-
<data key="scope_id">0</data>
20-
<data key="label">Yes</data>
19+
<data key="scope_id">1</data>
20+
<data key="label">No</data>
2121
<data key="value">0</data>
2222
</entity>
2323
<entity name="PurchaseOrderEnableConfigData">
2424
<data key="path">payment/purchaseorder/active</data>
25-
<data key="scope_id">0</data>
25+
<data key="scope_id">1</data>
2626
<data key="label">Yes</data>
2727
<data key="value">1</data>
2828
</entity>
2929
<entity name="PurchaseOrderDisabledConfigData">
3030
<data key="path">payment/purchaseorder/active</data>
31-
<data key="scope_id">0</data>
32-
<data key="label">Yes</data>
31+
<data key="scope_id">1</data>
32+
<data key="label">No</data>
3333
<data key="value">0</data>
3434
</entity>
3535
<entity name="CashOnDeliveryEnableConfigData">
3636
<data key="path">payment/cashondelivery/active</data>
37-
<data key="scope_id">0</data>
37+
<data key="scope_id">1</data>
3838
<data key="label">Yes</data>
3939
<data key="value">1</data>
4040
</entity>
4141
<entity name="CashOnDeliveryDisabledConfigData">
4242
<data key="path">payment/cashondelivery/active</data>
43-
<data key="scope_id">0</data>
44-
<data key="label">Yes</data>
43+
<data key="scope_id">1</data>
44+
<data key="label">No</data>
4545
<data key="value">0</data>
4646
</entity>
4747
</entities>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AdminApplyCouponToOrderActionGroup">
12+
<arguments>
13+
<argument name="couponCode" type="string"/>
14+
</arguments>
15+
<fillField selector="{{AdminOrderFormItemsSection.couponCode}}" userInput="{{couponCode}}" stepKey="fillCouponCode"/>
16+
<click selector="{{AdminOrderFormItemsSection.applyCoupon}}" stepKey="applyCoupon"/>
17+
<waitForPageLoad stepKey="waitForApplyingCoupon"/>
18+
<see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The coupon code has been accepted." stepKey="seeSuccessMessage"/>
19+
</actionGroup>
20+
</actionGroups>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,11 @@
8080
<click selector="{{AdminInvoicesFiltersSection.applyFilters}}" stepKey="clickApplyFilters"/>
8181
<waitForPageLoad stepKey="waitForFiltersApply"/>
8282
</actionGroup>
83+
84+
<actionGroup name="FilterInvoiceGridByOrderIdWithCleanFiltersActionGroup" extends="filterInvoiceGridByOrderId">
85+
<arguments>
86+
<argument name="orderId" type="string"/>
87+
</arguments>
88+
<conditionalClick selector="{{AdminInvoicesGridSection.clearFilters}}" dependentSelector="{{AdminInvoicesGridSection.clearFilters}}" visible="true" stepKey="clearFilters" after="goToInvoices"/>
89+
</actionGroup>
8390
</actionGroups>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,14 @@
112112
<wait time="5" stepKey="waitForOptionsToLoad"/>
113113
</actionGroup>
114114

115+
<actionGroup name="AddSimpleProductWithQtyToOrderActionGroup" extends="addSimpleProductToOrder">
116+
<arguments>
117+
<argument name="product" defaultValue="_defaultProduct" type="entity"/>
118+
<argument name="productQty" type="string"/>
119+
</arguments>
120+
<fillField selector="{{AdminOrderFormItemsSection.rowQty('1')}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
121+
</actionGroup>
122+
115123
<!--Add configurable product to order -->
116124
<actionGroup name="addConfigurableProductToOrder">
117125
<arguments>
@@ -369,6 +377,28 @@
369377
<conditionalClick selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" dependentSelector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" visible="true" stepKey="checkCheckMoneyOption"/>
370378
</actionGroup>
371379

380+
<!--Select Bank Transfer payment method-->
381+
<actionGroup name="SelectBankTransferPaymentMethodActionGroup" extends="SelectCheckMoneyPaymentMethod">
382+
<remove keyForRemoval="checkCheckMoneyOption"/>
383+
<conditionalClick selector="{{AdminOrderFormPaymentSection.checkBankTransfer}}" dependentSelector="{{AdminOrderFormPaymentSection.checkBankTransfer}}" visible="true" stepKey="checkBankTransferOption" after="waitForPaymentOptions"/>
384+
</actionGroup>
385+
386+
<!--Select Cash on Delivery payment method-->
387+
<actionGroup name="SelectCashOnDeliveryPaymentMethodActionGroup" extends="SelectCheckMoneyPaymentMethod">
388+
<remove keyForRemoval="checkCheckMoneyOption"/>
389+
<conditionalClick selector="{{AdminOrderFormPaymentSection.checkCashOnDelivery}}" dependentSelector="{{AdminOrderFormPaymentSection.checkCashOnDelivery}}" visible="true" stepKey="checkCashOnDeliveryOption" after="waitForPaymentOptions"/>
390+
</actionGroup>
391+
392+
<!--Select Purchase Order payment method-->
393+
<actionGroup name="SelectPurchaseOrderPaymentMethodActionGroup" extends="SelectCheckMoneyPaymentMethod">
394+
<arguments>
395+
<argument name="purchaseOrderNumber" type="string"/>
396+
</arguments>
397+
<remove keyForRemoval="checkCheckMoneyOption"/>
398+
<conditionalClick selector="{{AdminOrderFormPaymentSection.checkPurchaseOrder}}" dependentSelector="{{AdminOrderFormPaymentSection.checkPurchaseOrder}}" visible="true" stepKey="checkPurchaseOrderOption" after="waitForPaymentOptions"/>
399+
<fillField selector="{{AdminOrderFormPaymentSection.fieldPurchaseOrderNumber}}" userInput="{{purchaseOrderNumber}}" stepKey="fillPurchaseOrderNumber"/>
400+
</actionGroup>
401+
372402
<!-- Create Order -->
373403
<actionGroup name="CreateOrderActionGroup">
374404
<arguments>

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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="AdminSubmitOrderActionGroup">
12+
<click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
13+
<see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
14+
</actionGroup>
15+
</actionGroups>

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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="FilterShipmentGridByOrderIdActionGroup">
12+
<arguments>
13+
<argument name="orderId" type="string"/>
14+
</arguments>
15+
<amOnPage url="{{AdminShipmentPage.url}}" stepKey="goToShipments"/>
16+
<waitForPageLoad stepKey="waitForPageLoad"/>
17+
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearOrderFilters"/>
18+
<click selector="{{AdminShipmentGridSection.filter}}" stepKey="clickFilter"/>
19+
<fillField selector="{{AdminShipmentsFilterSection.orderNum}}" userInput="{{orderId}}" stepKey="fillOrderIdForFilter"/>
20+
<click selector="{{AdminShipmentsFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
21+
<waitForPageLoad stepKey="waitForFiltersApply"/>
22+
</actionGroup>
23+
</actionGroups>

0 commit comments

Comments
 (0)