Skip to content

Commit b01c6c3

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-90114' into 2.3-develop-mftf-pr1
# Conflicts: # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Page/AdminEditCustomerPage.xml # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridSection.xml # dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerOrderViewSection.xml
2 parents 74df7ce + ddaa315 commit b01c6c3

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
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"/>
1514
<element name="orderNumber22" type="text" selector=".order-number>strong"/>
1615
<element name="orderLink" type="text" selector="a[href*=order_id].order-number"/>
1716
</section>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<fillField userInput="{{customer.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
1818
<click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
1919
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
20-
<click selector="{{AdminCustomerGridSection.rowEditAction}}" stepKey="clickEdit"/>
20+
<click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEdit"/>
2121
<waitForPageLoad stepKey="waitForPageLoad2" />
2222
</actionGroup>
2323
</actionGroups>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +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="rowEditAction" type="button" selector=".data-grid-actions-cell .action-menu-item"/>
14-
<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"/>
1514
</section>
1615
</sections>

0 commit comments

Comments
 (0)