Skip to content

Commit 60e2521

Browse files
sidolovsidolov
authored
ENGCOM-5687: Add tip for upper limit of the Email Text Length Limit field range #24253 
2 parents ad44545 + 7104173 commit 60e2521

File tree

6 files changed

+117
-2
lines changed

6 files changed

+117
-2
lines changed

‎app/code/Magento/Wishlist/Test/Mftf/ActionGroup/setEmailTextLengthLimitActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="setEmailTextLengthLimitActionGroup">
12+
<arguments>
13+
<argument name="emailTextLengthLimit" defaultValue="Wishlist.default_email_text_length_limit" type="string"/>
14+
</arguments>
15+
<amOnPage url="{{AdminCustomerWishlistConfigurationPage.url}}" stepKey="navigateToWishListConfigurationPage"/>
16+
<conditionalClick selector="{{WishListShareOptionsSection.shareOptionsTabIsNotExpanded}}" dependentSelector="{{WishListShareOptionsSection.shareOptionsTabIsExpanded}}" visible="false" stepKey="expandTabInNotAlreadyExpanded"/>
17+
<uncheckOption selector="{{WishListShareOptionsSection.useSystemValueForWishListEmailTextLimit}}" stepKey="uncheckUseSystemValueForWishListEmailTextLimit"/>
18+
<fillField selector="{{WishListShareOptionsSection.emailTextLengthLimitInput}}" userInput="{{emailTextLengthLimit}}" stepKey="enterWishListTextLengthLimit"/>
19+
<click selector="{{AdminMainActionsSection.save}}" stepKey="tryToSaveWishListConfig"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Wishlist/Test/Mftf/Data/WishlistData.xml

100644100755
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
<var key="customer_password" entityType="customer" entityKey="password"/>
1515
<data key="shareInfo_emails">JohnDoe123456789@example.com,JohnDoe987654321@example.com,JohnDoe123456abc@example.com</data>
1616
<data key="shareInfo_message">Sharing message.</data>
17+
<data key="default_email_text_length_limit">255</data>
18+
<data key="min_email_text_length_limit">1</data>
19+
<data key="max_email_text_length_limit">10000</data>
1720
</entity>
1821
</entities>

‎app/code/Magento/Wishlist/Test/Mftf/Section/WishListShareOptionsSection.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="WishListShareOptionsSection">
12+
<element name="shareOptionsTab" type="button" selector="#wishlist_email-head"/>
13+
<element name="shareOptionsTabIsExpanded" type="button" selector="#wishlist_email-head.open"/>
14+
<element name="shareOptionsTabIsNotExpanded" type="button" selector="#wishlist_email-head"/>
15+
<element name="emailTextLengthLimitInput" type="input" selector="#wishlist_email_text_limit"/>
16+
<element name="emailTextLengthLimitMessage" type="text" selector="#wishlist_email_text_limit-error"/>
17+
<element name="useSystemValueForWishListEmailTextLimit" type="checkbox" selector="#wishlist_email_text_limit_inherit"/>
18+
</section>
19+
</sections>

‎app/code/Magento/Wishlist/Test/Mftf/Test/AdminCustomerWishListShareOptionsInputValidationTest.xml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
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="AdminCustomerWishListShareOptionsInputValidationTest">
12+
<annotations>
13+
<features value="Wishlist"/>
14+
<stories value="MAGETWO-8709"/>
15+
<group value="wishlist"/>
16+
<title value="When user tries to set the Email Text Length Limit higher then 10,000 then validation message occurs"/>
17+
<description value="When user tries to set the Email Text Length Limit higher then 10,000 then validation message occurs"/>
18+
<severity value="AVERAGE"/>
19+
<testCaseId value="N/a"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
23+
</before>
24+
<after>
25+
<actionGroup ref="setEmailTextLengthLimitActionGroup" stepKey="rollbackEmailTextLengthLimit">
26+
<argument name="emailTextLengthLimit" value="{{Wishlist.default_email_text_length_limit}}"/>
27+
</actionGroup>
28+
<checkOption selector="{{WishListShareOptionsSection.useSystemValueForWishListEmailTextLimit}}" stepKey="checkUseSystemValueForWishListEmailTextLimit"/>
29+
<amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
30+
</after>
31+
32+
<actionGroup ref="setEmailTextLengthLimitActionGroup" stepKey="setEmailTextLengthLimitToMin">
33+
<argument name="emailTextLengthLimit" value="{{Wishlist.min_email_text_length_limit}}"/>
34+
</actionGroup>
35+
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccessMessageForMinimum"/>
36+
<grabValueFrom selector="{{WishListShareOptionsSection.emailTextLengthLimitInput}}" stepKey="minimumWishListTextLengthLimit"/>
37+
<assertEquals stepKey="AssertMinimumTextLengthLimitIsApplied">
38+
<expectedResult type="string">{{Wishlist.min_email_text_length_limit}}</expectedResult>
39+
<actualResult type="variable">minimumWishListTextLengthLimit</actualResult>
40+
</assertEquals>
41+
42+
<actionGroup ref="setEmailTextLengthLimitActionGroup" stepKey="setEmailTextLengthLimitToMax">
43+
<argument name="emailTextLengthLimit" value="{{Wishlist.max_email_text_length_limit}}"/>
44+
</actionGroup>
45+
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccessMessageForMaximum"/>
46+
<grabValueFrom selector="{{WishListShareOptionsSection.emailTextLengthLimitInput}}" stepKey="maximumWishListTextLengthLimit"/>
47+
<assertEquals stepKey="AssertMaximumTextLengthLimitIsApplied">
48+
<expectedResult type="string">{{Wishlist.max_email_text_length_limit}}</expectedResult>
49+
<actualResult type="variable">maximumWishListTextLengthLimit</actualResult>
50+
</assertEquals>
51+
52+
<actionGroup ref="setEmailTextLengthLimitActionGroup" stepKey="setEmailTextLengthLimitToLowerThanMin">
53+
<argument name="emailTextLengthLimit" value="0"/>
54+
</actionGroup>
55+
<dontSee selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="dontSeeSuccessMessageForLowerThanMinimum"/>
56+
<grabTextFrom selector="{{WishListShareOptionsSection.emailTextLengthLimitMessage}}" stepKey="enterWishListTextLengthLimitLowerThanMinimum"/>
57+
<assertEquals stepKey="AssertTextLengthLimitIsNotAppliedWhenLowerThanMinimum">
58+
<expectedResult type="string">The value is not within the specified range.</expectedResult>
59+
<actualResult type="variable">enterWishListTextLengthLimitLowerThanMinimum</actualResult>
60+
</assertEquals>
61+
62+
<actionGroup ref="setEmailTextLengthLimitActionGroup" stepKey="setEmailTextLengthLimitToHigherThanMaximum">
63+
<argument name="emailTextLengthLimit" value="10001"/>
64+
</actionGroup>
65+
<dontSee selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="dontSeeSuccessMessageForHigherThanMaximum"/>
66+
<grabTextFrom selector="{{WishListShareOptionsSection.emailTextLengthLimitMessage}}" stepKey="enterWishListTextLengthLimitHigherThanMaximum"/>
67+
<assertEquals stepKey="AssertTextLengthLimitIsNotAppliedWhenHigherThanMaximum">
68+
<expectedResult type="string">The value is not within the specified range.</expectedResult>
69+
<actualResult type="variable">enterWishListTextLengthLimitHigherThanMaximum</actualResult>
70+
</assertEquals>
71+
</test>
72+
</tests>

‎app/code/Magento/Wishlist/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</field>
3030
<field id="text_limit" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
3131
<label>Email Text Length Limit</label>
32-
<comment>255 by default</comment>
32+
<comment>255 by default. Max - 10000</comment>
3333
<validate>validate-digits validate-digits-range digits-range-1-10000</validate>
3434
</field>
3535
</group>

‎app/code/Magento/Wishlist/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Back,Back
101101
"Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
102102
"10 by default. Max - 10000","10 by default. Max - 10000"
103103
"Email Text Length Limit","Email Text Length Limit"
104-
"255 by default","255 by default"
104+
"255 by default. Max - 10000","255 by default. Max - 10000"
105105
"General Options","General Options"
106106
Enabled,Enabled
107107
"My Wish List Link","My Wish List Link"

0 commit comments

Comments
 (0)