Skip to content

Add tip for upper limit of the Email Text Length Limit field range #24253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magento-engcom-team merged 2 commits into from
Aug 28, 2019
Merged

Add tip for upper limit of the Email Text Length Limit field range #24253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2c6268
Specify the upper range for Email Text Length Limit field
TomashKhamlai Aug 19, 2019
f236c1c
Cover validation for Email Text Length Limit field and check that pro…
TomashKhamlai Aug 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions app/code/Magento/Wishlist/Test/Mftf/ActionGroup/setEmailTextLengthLimitActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="setEmailTextLengthLimitActionGroup">
<arguments>
<argument name="emailTextLengthLimit" defaultValue="Wishlist.default_email_text_length_limit" type="string"/>
</arguments>
<amOnPage url="{{AdminCustomerWishlistConfigurationPage.url}}" stepKey="navigateToWishListConfigurationPage"/>
<conditionalClick selector="{{WishListShareOptionsSection.shareOptionsTabIsNotExpanded}}" dependentSelector="{{WishListShareOptionsSection.shareOptionsTabIsExpanded}}" visible="false" stepKey="expandTabInNotAlreadyExpanded"/>
<uncheckOption selector="{{WishListShareOptionsSection.useSystemValueForWishListEmailTextLimit}}" stepKey="uncheckUseSystemValueForWishListEmailTextLimit"/>
<fillField selector="{{WishListShareOptionsSection.emailTextLengthLimitInput}}" userInput="{{emailTextLengthLimit}}" stepKey="enterWishListTextLengthLimit"/>
<click selector="{{AdminMainActionsSection.save}}" stepKey="tryToSaveWishListConfig"/>
</actionGroup>
</actionGroups>
3 changes: 3 additions & 0 deletions app/code/Magento/Wishlist/Test/Mftf/Data/WishlistData.xml
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@
<var key="customer_password" entityType="customer" entityKey="password"/>
<data key="shareInfo_emails">JohnDoe123456789@example.com,JohnDoe987654321@example.com,JohnDoe123456abc@example.com</data>
<data key="shareInfo_message">Sharing message.</data>
<data key="default_email_text_length_limit">255</data>
<data key="min_email_text_length_limit">1</data>
<data key="max_email_text_length_limit">10000</data>
</entity>
</entities>
19 changes: 19 additions & 0 deletions app/code/Magento/Wishlist/Test/Mftf/Section/WishListShareOptionsSection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
<section name="WishListShareOptionsSection">
<element name="shareOptionsTab" type="button" selector="#wishlist_email-head"/>
<element name="shareOptionsTabIsExpanded" type="button" selector="#wishlist_email-head.open"/>
<element name="shareOptionsTabIsNotExpanded" type="button" selector="#wishlist_email-head"/>
<element name="emailTextLengthLimitInput" type="input" selector="#wishlist_email_text_limit"/>
<element name="emailTextLengthLimitMessage" type="text" selector="#wishlist_email_text_limit-error"/>
<element name="useSystemValueForWishListEmailTextLimit" type="checkbox" selector="#wishlist_email_text_limit_inherit"/>
</section>
</sections>
72 changes: 72 additions & 0 deletions .../Magento/Wishlist/Test/Mftf/Test/AdminCustomerWishListShareOptionsInputValidationTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="AdminCustomerWishListShareOptionsInputValidationTest">
<annotations>
<features value="Wishlist"/>
<stories value="MAGETWO-8709"/>
<group value="wishlist"/>
<title value="When user tries to set the Email Text Length Limit higher then 10,000 then validation message occurs"/>
<description value="When user tries to set the Email Text Length Limit higher then 10,000 then validation message occurs"/>
<severity value="AVERAGE"/>
<testCaseId value="N/a"/>
</annotations>
<before>
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
</before>
<after>
<actionGroup ref="setEmailTextLengthLimitActionGroup" stepKey="rollbackEmailTextLengthLimit">
<argument name="emailTextLengthLimit" value="{{Wishlist.default_email_text_length_limit}}"/>
</actionGroup>
<checkOption selector="{{WishListShareOptionsSection.useSystemValueForWishListEmailTextLimit}}" stepKey="checkUseSystemValueForWishListEmailTextLimit"/>
<amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
</after>

<actionGroup ref="setEmailTextLengthLimitActionGroup" stepKey="setEmailTextLengthLimitToMin">
<argument name="emailTextLengthLimit" value="{{Wishlist.min_email_text_length_limit}}"/>
</actionGroup>
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccessMessageForMinimum"/>
<grabValueFrom selector="{{WishListShareOptionsSection.emailTextLengthLimitInput}}" stepKey="minimumWishListTextLengthLimit"/>
<assertEquals stepKey="AssertMinimumTextLengthLimitIsApplied">
<expectedResult type="string">{{Wishlist.min_email_text_length_limit}}</expectedResult>
<actualResult type="variable">minimumWishListTextLengthLimit</actualResult>
</assertEquals>

<actionGroup ref="setEmailTextLengthLimitActionGroup" stepKey="setEmailTextLengthLimitToMax">
<argument name="emailTextLengthLimit" value="{{Wishlist.max_email_text_length_limit}}"/>
</actionGroup>
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccessMessageForMaximum"/>
<grabValueFrom selector="{{WishListShareOptionsSection.emailTextLengthLimitInput}}" stepKey="maximumWishListTextLengthLimit"/>
<assertEquals stepKey="AssertMaximumTextLengthLimitIsApplied">
<expectedResult type="string">{{Wishlist.max_email_text_length_limit}}</expectedResult>
<actualResult type="variable">maximumWishListTextLengthLimit</actualResult>
</assertEquals>

<actionGroup ref="setEmailTextLengthLimitActionGroup" stepKey="setEmailTextLengthLimitToLowerThanMin">
<argument name="emailTextLengthLimit" value="0"/>
</actionGroup>
<dontSee selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="dontSeeSuccessMessageForLowerThanMinimum"/>
<grabTextFrom selector="{{WishListShareOptionsSection.emailTextLengthLimitMessage}}" stepKey="enterWishListTextLengthLimitLowerThanMinimum"/>
<assertEquals stepKey="AssertTextLengthLimitIsNotAppliedWhenLowerThanMinimum">
<expectedResult type="string">The value is not within the specified range.</expectedResult>
<actualResult type="variable">enterWishListTextLengthLimitLowerThanMinimum</actualResult>
</assertEquals>

<actionGroup ref="setEmailTextLengthLimitActionGroup" stepKey="setEmailTextLengthLimitToHigherThanMaximum">
<argument name="emailTextLengthLimit" value="10001"/>
</actionGroup>
<dontSee selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="dontSeeSuccessMessageForHigherThanMaximum"/>
<grabTextFrom selector="{{WishListShareOptionsSection.emailTextLengthLimitMessage}}" stepKey="enterWishListTextLengthLimitHigherThanMaximum"/>
<assertEquals stepKey="AssertTextLengthLimitIsNotAppliedWhenHigherThanMaximum">
<expectedResult type="string">The value is not within the specified range.</expectedResult>
<actualResult type="variable">enterWishListTextLengthLimitHigherThanMaximum</actualResult>
</assertEquals>
</test>
</tests>
2 changes: 1 addition & 1 deletion app/code/Magento/Wishlist/etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</field>
<field id="text_limit" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Email Text Length Limit</label>
<comment>255 by default</comment>
<comment>255 by default. Max - 10000</comment>
<validate>validate-digits validate-digits-range digits-range-1-10000</validate>
</field>
</group>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Wishlist/i18n/en_US.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Back,Back
"Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
"10 by default. Max - 10000","10 by default. Max - 10000"
"Email Text Length Limit","Email Text Length Limit"
"255 by default","255 by default"
"255 by default. Max - 10000","255 by default. Max - 10000"
"General Options","General Options"
Enabled,Enabled
"My Wish List Link","My Wish List Link"
Expand Down