Skip to content

Commit aeedabb

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-90113' into 90113and90114
# Conflicts: # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminEditCustomerPage.xml # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontCustomerOrderPage.xml # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerOrderViewSection.xml # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/AdminCreateCustomerTest.xml
2 parents 99eba28 + 9f81702 commit aeedabb

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@
1212
<element name="next" type="button" selector="button.button.action.continue.primary"/>
1313
<element name="firstShippingMethod" type="radio" selector="//*[@id='checkout-shipping-method-load']//input[@class='radio']"/>
1414
<element name="shippingMethodRow" type="text" selector=".form.methods-shipping table tbody tr"/>
15+
<element name="checkShippingMethodByName" type="radio" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/..//input" parameterized="true"/>
16+
<element name="shippingMethodRowByName" type="text" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/.." parameterized="true"/>
1517
</section>
1618
</sections>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<section name="CheckoutSuccessMainSection">
1212
<element name="success" type="text" selector="div.checkout-success"/>
1313
<element name="orderNumber" type="text" selector="div.checkout-success > p:nth-child(1) > span"/>
14+
<element name="orderNumberLink" type="text" selector=".order-number"/>
1415
<element name="orderNumber22" type="text" selector=".order-number>strong"/>
1516
<element name="orderLink" type="text" selector="a[href*=order_id].order-number"/>
1617
</section>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminEditCustomerPage.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
98
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11-
<page name="AdminEditCustomerPage" url="/customer/index/edit/id" area="admin" module="Magento_Customer">
12-
<section name="AdminEditCuctomerInformationSection"/>
13-
<section name="AdminEditCustomerOrdersSection"/>
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
10+
<page name="AdminEditCustomerPage" url="/customer/index/edit/id/{{var1}}" area="admin" module="Magento_Customer" parameterized="true">
11+
<section name="AdminCustomerAccountInformationSection"/>
12+
<section name="AdminCustomerMainActionsSection"/>
1413
</page>
1514
</pages>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/StorefrontHomePage.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="StorefrontProductPage" url="/" area="storefront" module="Magento_Customer">
11+
<page name="StorefrontHomePage" url="/" area="storefront" module="Magento_Customer">
1212
<section name="StorefrontPanelHeader" />
1313
</page>
1414
</pages>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerOrderViewSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
98
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
109
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1110
<section name="StorefrontCustomerOrderViewSection">
11+
<element name="reorder" type="text" selector="a.action.order" timeout="30"/>
1212
<element name="orderTitle" type="text" selector=".page-title span"/>
1313
<element name="myOrdersTable" type="text" selector="#my-orders-table"/>
1414
<element name="subtotal" type="text" selector=".subtotal .amount"/>

0 commit comments

Comments
 (0)