Skip to content

Commit 99eba28

Browse files
1408sheva1408sheva
committed
Merge remote-tracking branch 'origin/MAGETWO-90114' into 90113and90114
# Conflicts: # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/AdminCreateCustomerTest.xml
2 parents 66fa85b + ddaa315 commit 99eba28

12 files changed

+60
-32
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/CheckoutPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11-
<page name="CheckoutPage" url="/checkout" area="storefront" module="Checkout">
11+
<page name="CheckoutPage" url="/checkout" area="storefront" module="Magento_Checkout">
1212
<section name="CheckoutShippingSection"/>
1313
<section name="CheckoutShippingMethodsSection"/>
1414
<section name="CheckoutOrderSummarySection"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525
<element name="ProductOptionsActiveByProductItemName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']//ancestor::div[@class='product-item-details']//div[@class='product options active']" parameterized="true" />
2626
<element name="shipToInfomation" type="text" selector="//div[@class='ship-to']//div[@class='shipping-information-content']" />
2727
<element name="shippingMethodInfomation" type="text" selector="//div[@class='ship-via']//div[@class='shipping-information-content']" />
28+
<element name="paymentMethodTitle" type="text" selector=".payment-method-title span" />
2829
</section>
2930
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/OpenEditCustomerFromAdminActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="OpenEditCustomerFromAdminActionGroup">
11+
<arguments>
12+
<argument name="customer"/>
13+
</arguments>
14+
<amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
15+
<waitForPageLoad stepKey="waitForPageLoad1" />
16+
<click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
17+
<fillField userInput="{{customer.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
18+
<click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
19+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
20+
<click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEdit"/>
21+
<waitForPageLoad stepKey="waitForPageLoad2" />
22+
</actionGroup>
23+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminCustomerPage.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11-
<page name="AdminCustomerPage" url="/customer/index/" area="admin" module="Customer">
12-
<section name="AdminCustomerMainActionsSection"/>
11+
<page name="AdminCustomerPage" url="/customer/index/" area="admin" module="Magento_Customer">
12+
<section name="AdminCustomerGridMainActionsSection"/>
1313
<section name="AdminCustomerMessagesSection"/>
1414
<section name="AdminCustomerGridSection"/>
1515
<section name="AdminCustomerFiltersSection"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminNewCustomerPage.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11-
<page name="AdminNewCustomerPage" url="/customer/index/new" area="admin" module="Customer">
12-
<section name="AdminNewCustomerAccountInformationSection"/>
13-
<section name="AdminNewCustomerMainActionsSection"/>
11+
<page name="AdminNewCustomerPage" url="/customer/index/new" area="admin" module="Magento_Customer">
12+
<section name="AdminCustomerAccountInformationSection"/>
13+
<section name="AdminCustomerMainActionsSection"/>
1414
</page>
1515
</pages>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerAccountInformationSection.xml renamed to ‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerAccountInformationSection.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11-
<section name="AdminNewCustomerAccountInformationSection">
11+
<section name="AdminCustomerAccountInformationSection">
12+
<element name="accountInformationTitle" type="text" selector=".admin__page-nav-title"/>
1213
<element name="firstName" type="input" selector="input[name='customer[firstname]']"/>
1314
<element name="lastName" type="input" selector="input[name='customer[lastname]']"/>
1415
<element name="email" type="input" selector="input[name='customer[email]']"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridMainActionsSection.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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="AdminCustomerGridMainActionsSection">
12+
<element name="addNewCustomer" type="button" selector="#add" timeout="30"/>
13+
</section>
14+
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminCustomerGridSection">
1212
<element name="customerGrid" type="text" selector="table[data-role='grid']"/>
13-
<element name="firstRowEditLink" type="checkbox" selector="tr[data-repeat-index='0'] .action-menu-item" timeout="30"/>
13+
<element name="firstRowEditLink" type="text" selector="tr[data-repeat-index='0'] .action-menu-item" timeout="30"/>
1414
</section>
1515
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMainActionsSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminCustomerMainActionsSection">
12-
<element name="addNewCustomer" type="button" selector="#add" timeout="30"/>
12+
<element name="saveButton" type="button" selector="#save" timeout="30"/>
1313
</section>
1414
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerMainActionsSection.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)