Skip to content

Commit 190128b

Browse files
soumyausoumyau
authored
Merge pull request #167 from magento-pangolin/MC-8972
MC-8972 Backport for MC-13210
2 parents 6933145 + 64d0c39 commit 190128b

6 files changed

+47
-7
lines changed

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
<argument name="customerEmail"/>
1313
</arguments>
1414
<amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomersPage"/>
15+
<waitForPageLoad stepKey="waitForCustomerPageLoad"/>
1516
<conditionalClick selector="{{AdminCustomerFiltersSection.clearAll}}" dependentSelector="{{AdminCustomerFiltersSection.clearAll}}" visible="true" stepKey="clickClearFilters"/>
16-
<click stepKey="chooseCustomer" selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(customerEmail)}}"/>
17-
<click stepKey="openActions" selector="{{AdminCustomerGridMainActionsSection.actions}}"/>
17+
<click selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(customerEmail)}}" stepKey="chooseCustomer"/>
18+
<click selector="{{AdminCustomerGridMainActionsSection.actions}}" stepKey="openActions"/>
1819
<waitForPageLoad stepKey="waitActions"/>
19-
<click stepKey="delete" selector="{{AdminCustomerGridMainActionsSection.delete}}"/>
20+
<click selector="{{AdminCustomerGridMainActionsSection.delete}}" stepKey="deleteCustomer"/>
2021
<waitForPageLoad stepKey="waitForConfirmationAlert"/>
21-
<click stepKey="accept" selector="{{AdminCustomerGridMainActionsSection.ok}}"/>
22+
<click selector="{{AdminCustomerGridMainActionsSection.ok}}" stepKey="acceptDeletion"/>
2223
<waitForPageLoad stepKey="waitForDelete"/>
23-
<see stepKey="seeSuccessMessage" userInput="were deleted."/>
24+
<see userInput="were deleted." stepKey="seeSuccessMessage"/>
2425
</actionGroup>
2526
</actionGroups>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontFillRegistrationFormActionGroup.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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="StorefrontFillRegistrationFormActionGroup">
11+
<arguments>
12+
<argument name="customer" defaultValue="CustomerEntityOne"/>
13+
</arguments>
14+
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
15+
<waitForPageLoad stepKey="waitForNavigateToCustomersPageLoad"/>
16+
<click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
17+
<fillField stepKey="fillFirstName" userInput="{{customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
18+
<fillField stepKey="fillLastName" userInput="{{customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>
19+
<fillField stepKey="fillEmail" userInput="{{customer.email}}" selector="{{StorefrontCustomerCreateFormSection.emailField}}"/>
20+
<fillField stepKey="fillPassword" userInput="{{customer.password}}" selector="{{StorefrontCustomerCreateFormSection.passwordField}}"/>
21+
<fillField stepKey="fillConfirmPassword" userInput="{{customer.password}}" selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSaveRegistrationFormActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="StorefrontSaveRegistrationFormActionGroup">
11+
<click selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}" stepKey="clickCreateAccountButton"/>
12+
<waitForPageLoad stepKey="waitForCreateAccountButtonToLoad"/>
13+
</actionGroup>
14+
</actionGroups>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,7 @@
1717
<element name="groupValue" type="button" selector="//span[text()='{{groupValue}}']" parameterized="true"/>
1818
<element name="associateToWebsite" type="select" selector="select[name='customer[website_id]']"/>
1919
<element name="storeView" type="select" selector="select[name='customer[sendemail_store_id]']"/>
20+
<element name="accountInformationTab" type="button" selector="#tab_customer"/>
21+
<element name="attributeImage" type="block" selector=".file-uploader-preview img"/>
2022
</section>
2123
</sections>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<element name="emailInput" type="input" selector="input[name=email]"/>
1515
<element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
1616
<element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
17-
<element name="clearAll" type="button" selector=".admin__data-grid-header .action-tertiary.action-clear"/>
17+
<element name="clearAll" type="button" selector=".admin__data-grid-header .action-tertiary.action-clear" timeout="30"/>
1818
<element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
1919
</section>
2020
</sections>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminCustomerGridMainActionsSection">
1212
<element name="addNewCustomer" type="button" selector="#add" timeout="30"/>
13+
<element name="actions" type="text" selector=".action-select"/>
1314
<element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{arg}}')]/../preceding-sibling::td[contains(@class, 'data-grid-checkbox-cell')]//input" parameterized="true"/>
1415
<element name="delete" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Delete']"/>
15-
<element name="actions" type="text" selector=".action-select"/>
1616
<element name="ok" type="button" selector=".modal-footer button.action-accept"/>
1717
</section>
1818
</sections>

0 commit comments

Comments
 (0)