Skip to content

Commit 2ac710d

Browse files
DmitryTsymbalDmitryTsymbal
committed
Newsletter Guest Subscription With Disallowed Optio nTest
1 parent a94aa00 commit 2ac710d

7 files changed

+82
-4
lines changed

‎app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewSubscriberActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="StorefrontCreateNewSubscriberActionGroup">
11+
<actionGroup name="StorefrontCreateNewSubscriberActionGroup" deprecated="Use StorefrontCreateNewsletterSubscriberActionGroup">
12+
<!-- Deprecated Due to inconsistency with the best practices -->
1213
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
1314
<submitForm selector="{{BasicFrontendNewsletterFormSection.subscribeForm}}"
1415
parameterArray="['email' => '{{_defaultNewsletter.senderEmail}}']"

‎app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewsletterSubscriberActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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="StorefrontCreateNewsletterSubscriberActionGroup">
12+
<arguments>
13+
<argument name="email" type="string"/>
14+
</arguments>
15+
<fillField stepKey="fillEmailField" selector="{{BasicFrontendNewsletterFormSection.newsletterEmail}}" userInput="{{email}}"/>
16+
<click selector="{{BasicFrontendNewsletterFormSection.subscribeButton}}" stepKey="submitForm"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection/BasicFrontendNewsletterFormSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="BasicFrontendNewsletterFormSection">
11-
<element name="newsletterEmail" type="input" selector="#newsletter"/>
12-
<element name="subscribeButton" type="button" selector=".subscribe" timeout="30"/>
11+
<element name="newsletterEmail" type="input" selector=".control #newsletter"/>
12+
<element name="subscribeButton" type="button" selector=".actions .action.subscribe.primary" timeout="30"/>
1313
<element name="subscribeForm" type="input" selector="#newsletter-validate-detail" timeout="30"/>
1414
</section>
1515
</sections>

‎app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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="StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest">
12+
<annotations>
13+
<features value="Newsletter"/>
14+
<stories value="Disabled Guest Newsletter Subscription"/>
15+
<title value="Newsletter Subscription for guest is disabled and cannot be performed"/>
16+
<description value="Guest cannot subscribe to Newsletter if it is disallowed in configurations"/>
17+
<group value="newsletter"/>
18+
<group value="configuration"/>
19+
</annotations>
20+
<before>
21+
<magentoCLI stepKey="disableGuestSubscription" command="config:set newsletter/subscription/allow_guest_subscribe 0"/>
22+
<magentoCLI command="cache:clean config" stepKey="cleanCache"/>
23+
</before>
24+
<after>
25+
<magentoCLI stepKey="allowGuestSubscription" command="config:set newsletter/subscription/allow_guest_subscribe 1"/>
26+
<magentoCLI command="cache:clean config" stepKey="cacheClean"/>
27+
</after>
28+
29+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStorefrontPage"/>
30+
<actionGroup ref="StorefrontCreateNewsletterSubscriberActionGroup" stepKey="createSubscription">
31+
<argument name="email" value="{{_defaultNewsletter.senderEmail}}"/>
32+
</actionGroup>
33+
<actionGroup ref="StorefrontAssertErrorMessageActionGroup" stepKey="assertMessage">
34+
<argument name="message" value="Sorry, but the administrator denied subscription for guests. Please register."/>
35+
<argument name="messageType" value="error"/>
36+
</actionGroup>
37+
</test>
38+
</tests>

‎app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest">
11+
<test name="VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest" deprecated="Use StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest">
12+
<!-- Deprecated Due to inconsistency with the best practices -->
1213
<annotations>
1314
<features value="Newsletter"/>
1415
<stories value="Configure guest newsletter subscription to 'No'"/>

‎app/code/Magento/Ui/Test/Mftf/ActionGroup/StorefrontAssertErrorMessageActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="StorefrontAssertErrorMessageActionGroup">
12+
<arguments>
13+
<argument name="message" type="string"/>
14+
<argument name="messageType" type="string" defaultValue="success"/>
15+
</arguments>
16+
17+
<see userInput="{{message}}" selector="{{StorefrontMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Ui/Test/Mftf/Section/StorefrontMessagesSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
<element name="success" type="text" selector="div.message-success.success.message"/>
1313
<element name="error" type="text" selector="div.message-error.error.message"/>
1414
<element name="noticeMessage" type="text" selector="div.message.notice div"/>
15+
<element name="messageByType" type="text" selector=".messages .message-{{messageType}}" parameterized="true" />
1516
</section>
1617
</sections>

0 commit comments

Comments
 (0)