magento · magento-engcom-team · Jul 11, 2020 · Jun 24, 2020 · Jul 8, 2020 · Jul 8, 2020
diff --git a/...ode/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewSubscriberActionGroup.xml b/...ode/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewSubscriberActionGroup.xml
@@ -8,7 +8,8 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="StorefrontCreateNewSubscriberActionGroup">
+    <actionGroup name="StorefrontCreateNewSubscriberActionGroup" deprecated="Use StorefrontCreateNewsletterSubscriberActionGroup">
+        <!-- Deprecated Due to inconsistency with the best practices -->
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
         <submitForm selector="{{BasicFrontendNewsletterFormSection.subscribeForm}}"
                     parameterArray="['email' => '{{_defaultNewsletter.senderEmail}}']"

diff --git a/...ento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewsletterSubscriberActionGroup.xml b/...ento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewsletterSubscriberActionGroup.xml
@@ -0,0 +1,18 @@
+<?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="StorefrontCreateNewsletterSubscriberActionGroup">
+        <arguments>
+            <argument name="email" type="string"/>
+        </arguments>
+        <fillField stepKey="fillEmailField" selector="{{BasicFrontendNewsletterFormSection.newsletterEmail}}" userInput="{{email}}"/>
+        <click selector="{{BasicFrontendNewsletterFormSection.subscribeButton}}" stepKey="submitForm"/>
+    </actionGroup>
+</actionGroups>
diff --git a/...letter/Test/Mftf/Section/NewsletterTemplateSection/BasicFrontendNewsletterFormSection.xml b/...letter/Test/Mftf/Section/NewsletterTemplateSection/BasicFrontendNewsletterFormSection.xml
@@ -8,8 +8,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BasicFrontendNewsletterFormSection">
-        <element name="newsletterEmail" type="input" selector="#newsletter"/>
-        <element name="subscribeButton" type="button" selector=".subscribe" timeout="30"/>
+        <element name="newsletterEmail" type="input" selector=".control #newsletter"/>
+        <element name="subscribeButton" type="button" selector=".actions .action.subscribe.primary" timeout="30"/>
         <element name="subscribeForm" type="input" selector="#newsletter-validate-detail" timeout="30"/>
     </section>
 </sections>
diff --git a/...wsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml b/...wsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml
@@ -0,0 +1,39 @@
+<?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="StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest">
+        <annotations>
+            <features value="Newsletter"/>
+            <stories value="Disabled Guest Newsletter Subscription"/>
+            <title value="Newsletter Subscription for guest is disabled and cannot be performed"/>
+            <description value="Guest cannot subscribe to Newsletter if it is disallowed in configurations"/>
+            <group value="newsletter"/>
+            <group value="configuration"/>
+            <testCaseId value="MC-35728"/>
+        </annotations>
+        <before>
+            <magentoCLI stepKey="disableGuestSubscription" command="config:set newsletter/subscription/allow_guest_subscribe 0"/>
+            <magentoCLI command="cache:clean config" stepKey="cleanCache"/>
+        </before>
+        <after>
+            <magentoCLI stepKey="allowGuestSubscription" command="config:set newsletter/subscription/allow_guest_subscribe 1"/>
+            <magentoCLI command="cache:clean config" stepKey="cacheClean"/>
+        </after>
+
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStorefrontPage"/>
+        <actionGroup ref="StorefrontCreateNewsletterSubscriberActionGroup" stepKey="createSubscription">
+            <argument name="email" value="{{_defaultNewsletter.senderEmail}}"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertErrorMessageActionGroup" stepKey="assertMessage">
+            <argument name="message" value="Sorry, but the administrator denied subscription for guests. Please register."/>
+            <argument name="messageType" value="error"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/...ento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml b/...ento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml
@@ -8,7 +8,8 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest">
+    <test name="VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest" deprecated="Use StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest">
+        <!-- Deprecated Due to inconsistency with the best practices -->
         <annotations>
             <features value="Newsletter"/>
             <stories value="Configure guest newsletter subscription to 'No'"/>

diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/StorefrontAssertErrorMessageActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/StorefrontAssertErrorMessageActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="StorefrontAssertErrorMessageActionGroup">
+        <arguments>
+            <argument name="message" type="string"/>
+            <argument name="messageType" type="string" defaultValue="success"/>
+        </arguments>
+
+        <see userInput="{{message}}" selector="{{StorefrontMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/StorefrontMessagesSection.xml
@@ -12,5 +12,6 @@
         <element name="success" type="text" selector="div.message-success.success.message"/>
         <element name="error" type="text" selector="div.message-error.error.message"/>
         <element name="noticeMessage" type="text" selector="div.message.notice div"/>
+        <element name="messageByType" type="text" selector=".messages .message-{{messageType}}" parameterized="true" />
     </section>
 </sections>