Skip to content

Commit e8fac9d

Browse files
nikhilsharma-adobenikhilsharma-adobe
committed
Merge branch 'ACQE-6684_1' into ACQE-6777_mainline_deployment
2 parents 52a6aae + 9166f5f commit e8fac9d

File tree

3 files changed

+79
-0
lines changed

3 files changed

+79
-0
lines changed

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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="AdminOpenPasswordOptionsSectionActionGroup">
12+
<annotations>
13+
<description>Goes to the Customer Configuration page and open password options section.</description>
14+
</annotations>
15+
<conditionalClick selector="{{AdminCustomerConfigSection.passwordOptions}}" dependentSelector="{{AdminCustomerConfigSection.passwordOptions}}" visible="true" stepKey="expandTab"/>
16+
</actionGroup>
17+
</actionGroups>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,10 @@
1717
<element name="showTelephoneInherit" type="checkbox" selector="#customer_address_telephone_show_inherit"/>
1818
<element name="showCompany" type="select" selector="#customer_address_company_show"/>
1919
<element name="showCompanyInherit" type="select" selector="#customer_address_company_show_inherit"/>
20+
<element name="passwordOptions" type="select" selector="#customer_password-head"/>
21+
<element name="passwordResetProtectionType" type="select" selector="#customer_password_password_reset_protection_type"/>
22+
<element name="passwordResetProtectionTypeOptions" type="select" selector="#customer_password_password_reset_protection_type option:nth-child({{option}})" parameterized="true"/>
23+
<element name="maxReqsOfPasswordReset" type="select" selector="#customer_password_max_number_password_reset_requests"/>
24+
<element name="minTimeBtwnPasswordResetRequest" type="select" selector="#customer_password_min_time_between_password_reset_requests"/>
2025
</section>
2126
</sections>

‎app/code/Magento/Customer/Test/Mftf/Test/AdminAssertPasswordResetSettingsTest.xml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminAssertPasswordResetSettingsTest">
12+
<annotations>
13+
<features value="Customer"/>
14+
<stories value="Password rest settings"/>
15+
<title value="Admin assert password reset setting"/>
16+
<description value="Admin assert password reset settings section in customer configuration page."/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="AC-4449"/>
19+
</annotations>
20+
<before>
21+
<!-- Login to admin -->
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
23+
</before>
24+
<after>
25+
<!-- Logout from admin -->
26+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
27+
</after>
28+
<!--Navigate to Customer Configuration Page-->
29+
<actionGroup ref="AdminNavigateToCustomerConfigurationActionGroup" stepKey="gotoCustomerConfiguration"/>
30+
<!--Expand to Password Options Page-->
31+
<actionGroup ref="AdminOpenPasswordOptionsSectionActionGroup" stepKey="gotoPasswordOptions"/>
32+
<!--See values for password reset protection type-->
33+
<seeOptionIsSelected selector="{{AdminCustomerConfigSection.passwordResetProtectionType}}" userInput="By IP and Email" stepKey="seeOneColumnSelected"/>
34+
<waitForElement selector="{{AdminCustomerConfigSection.passwordResetProtectionTypeOptions('2')}}" stepKey="waitToGrabTextFromOption2"/>
35+
<grabTextFrom selector="{{AdminCustomerConfigSection.passwordResetProtectionTypeOptions('2')}}" stepKey="grabTextFromOption2"/>
36+
<assertEquals stepKey="assertByIPIsPresent">
37+
<expectedResult type="string">By IP</expectedResult>
38+
<actualResult type="string">{$grabTextFromOption2}</actualResult>
39+
</assertEquals>
40+
<waitForElement selector="{{AdminCustomerConfigSection.passwordResetProtectionTypeOptions('3')}}" stepKey="waitToGrabTextFromOption3"/>
41+
<grabTextFrom selector="{{AdminCustomerConfigSection.passwordResetProtectionTypeOptions('3')}}" stepKey="grabTextFromOption3"/>
42+
<assertEquals stepKey="assertByEmailIsPresent">
43+
<expectedResult type="string">By Email</expectedResult>
44+
<actualResult type="string">{$grabTextFromOption3}</actualResult>
45+
</assertEquals>
46+
<waitForElement selector="{{AdminCustomerConfigSection.passwordResetProtectionTypeOptions('4')}}" stepKey="waitToGrabTextFromOption4"/>
47+
<grabTextFrom selector="{{AdminCustomerConfigSection.passwordResetProtectionTypeOptions('4')}}" stepKey="grabTextFromOption4"/>
48+
<assertEquals stepKey="assertNoneIsPresent">
49+
<expectedResult type="string">None</expectedResult>
50+
<actualResult type="string">{$grabTextFromOption4}</actualResult>
51+
</assertEquals>
52+
<!--See Max Number of Password Reset Requests field is present and has numeric value-->
53+
<seeInField selector="{{AdminCustomerConfigSection.maxReqsOfPasswordReset}}" userInput="5" stepKey="seeValueForPasswordResetRequests"/>
54+
<!--See Min Time Between Password Reset Requests field is present and has numeric value-->
55+
<seeInField selector="{{AdminCustomerConfigSection.minTimeBtwnPasswordResetRequest}}" userInput="10" stepKey="seeValueForMinTimeBtwnPasswordResetRequest"/>
56+
</test>
57+
</tests>

0 commit comments

Comments
 (0)