Skip to content

Commit 1b71175

Browse files
authored
Merge pull request #112 from magento-pangolin/MC-4519
MC-4519
2 parents c8258ed + e56be12 commit 1b71175

File tree

6 files changed

+75
-0
lines changed

6 files changed

+75
-0
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="StorefrontCheckoutCustomerSignInActionGroup">
12+
<arguments>
13+
<argument name="customerEmail" type="string" defaultValue="$$createCustomer.email$$"/>
14+
<argument name="password" type="string" defaultValue="$$createCustomer.password$$"/>
15+
</arguments>
16+
<fillField selector="{{CheckoutShippingSection.email}}" userInput="{{customerEmail}}" stepKey="fillEmailAddress"/>
17+
<waitForElementVisible selector="{{CheckoutShippingSection.password}}" stepKey="waitForPasswordFieldToBeVisible"/>
18+
<fillField selector="{{CheckoutShippingSection.password}}" userInput="{{password}}" stepKey="fillPassword"/>
19+
<click selector="{{CheckoutShippingSection.loginButton}}" stepKey="clickLoginButton"/>
20+
<waitForPageLoad stepKey="waitForLoginPageToLoad"/>
21+
</actionGroup>
22+
</actionGroups>

app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@
1313
<element name="checkPaymentMethodByName" type="radio" selector="//div[@id='checkout-payment-method-load']//div[@class='payment-method']//label//span[contains(., '{{methodName}}')]/../..//input" parameterized="true"/>
1414
<element name="billingAddressSameAsShipping" type="checkbox" selector=".payment-method._active [name='billing-address-same-as-shipping']"/>
1515
<element name="billingAddressSameAsShippingShared" type="checkbox" selector="#billing-address-same-as-shipping-shared"/>
16+
<element name="paymentOnAccount" type="radio" selector="#companycredit"/>
17+
<element name="paymentOnAccountLabel" type="text" selector="//span[text()='Payment on Account']"/>
18+
<element name="purchaseOrderNumber" type="input" selector="#po_number"/>
1619
</section>
1720
</sections>
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
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="EnablePaymentCheckMOConfigData">
12+
<data key="path">payment/checkmo/active</data>
13+
<data key="scope_id">0</data>
14+
<data key="label">Yes</data>
15+
<data key="value">1</data>
16+
</entity>
17+
<entity name="DisablePaymentCheckMOConfigData">
18+
<data key="path">payment/checkmo/active</data>
19+
<data key="scope_id">0</data>
20+
<data key="label">No</data>
21+
<data key="value">0</data>
22+
</entity>
23+
<entity name="EnablePaymentBankTransferConfigData">
24+
<data key="path">payment/banktransfer/active</data>
25+
<data key="scope_id">0</data>
26+
<data key="label">Yes</data>
27+
<data key="value">1</data>
28+
</entity>
29+
<entity name="DisablePaymentBankTransferConfigData">
30+
<data key="path">payment/banktransfer/active</data>
31+
<data key="scope_id">0</data>
32+
<data key="label">No</data>
33+
<data key="value">0</data>
34+
</entity>
35+
<entity name="EnablePaymentCashOnDeliveryData">
36+
<data key="path">payment/cashondelivery/active</data>
37+
<data key="scope_id">0</data>
38+
<data key="label">Yes</data>
39+
<data key="value">1</data>
40+
</entity>
41+
<entity name="DisablePaymentCashOnDeliveryData">
42+
<data key="path">payment/cashondelivery/active</data>
43+
<data key="scope_id">0</data>
44+
<data key="label">No</data>
45+
<data key="value">0</data>
46+
</entity>
47+
</entities>

app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceOrderInformationSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
<element name="customerName" type="text" selector=".order-account-information table tr:first-of-type > td span"/>
1717
<element name="customerEmail" type="text" selector=".order-account-information table tr:nth-of-type(2) > td a"/>
1818
<element name="customerGroup" type="text" selector=".order-account-information table tr:nth-of-type(3) > td"/>
19+
<element name="invoiceNoteComment" type="text" selector="div.note-list-comment"/>
1920
</section>
2021
</sections>

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
<element name="billingAddress" type="text" selector=".order-billing-address"/>
2020
<element name="shippingAddress" type="text" selector=".order-shipping-address"/>
2121
<element name="itemsOrdered" type="text" selector=".edit-order-table"/>
22+
<element name="paymentInformation" type="text" selector="//div[@class='order-payment-method-title']"/>
2223
</section>
2324
</sections>

app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@
3131
<element name="viewColumnCheckbox" type="checkbox" selector="//div[contains(@class,'admin__data-grid-action-columns')]//div[contains(@class, 'admin__field-option')]//label[text() = '{{column}}']/preceding-sibling::input" parameterized="true"/>
3232
<element name="customerInOrdersSection" type="button" selector="(//td[contains(text(),'{{customer}}')])[1]" parameterized="true"/>
3333
<element name="productForOrder" type="button" selector="//td[contains(text(),'{{var}}')]" parameterized="true"/>
34+
<element name="viewLink" type="text" selector="//td/div[contains(.,'{{orderID}}')]/../..//a[@class='action-menu-item']" parameterized="true"/>
3435
</section>
3536
</sections>

0 commit comments

Comments
 (0)