From 2ac710d04e4953c1c850567daa88a5e6d9e7cdb7 Mon Sep 17 00:00:00 2001 From: Dmitry Tsymbal Date: Wed, 24 Jun 2020 15:39:19 +0300 Subject: [PATCH 1/2] Newsletter Guest Subscription With Disallowed Optio nTest --- ...orefrontCreateNewSubscriberActionGroup.xml | 3 +- ...tCreateNewsletterSubscriberActionGroup.xml | 18 +++++++++ .../BasicFrontendNewsletterFormSection.xml | 4 +- ...stSubscriptionWithDisallowedOptionTest.xml | 38 +++++++++++++++++++ ...inkDisplayedForGuestSubscriptionNoTest.xml | 3 +- ...torefrontAssertErrorMessageActionGroup.xml | 19 ++++++++++ .../Section/StorefrontMessagesSection.xml | 1 + 7 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewsletterSubscriberActionGroup.xml create mode 100644 app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml create mode 100644 app/code/Magento/Ui/Test/Mftf/ActionGroup/StorefrontAssertErrorMessageActionGroup.xml diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewSubscriberActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewSubscriberActionGroup.xml index 0aee2cb9b2e3c..482ecec583552 100644 --- a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewSubscriberActionGroup.xml +++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewSubscriberActionGroup.xml @@ -8,7 +8,8 @@ - + + + + + + + + + + + + + diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection/BasicFrontendNewsletterFormSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection/BasicFrontendNewsletterFormSection.xml index 8475fb4d55b9e..f4c685e730be3 100644 --- a/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection/BasicFrontendNewsletterFormSection.xml +++ b/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection/BasicFrontendNewsletterFormSection.xml @@ -8,8 +8,8 @@
- - + +
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml new file mode 100644 index 0000000000000..bb4b550f04063 --- /dev/null +++ b/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml @@ -0,0 +1,38 @@ + + + + + + + + + + <description value="Guest cannot subscribe to Newsletter if it is disallowed in configurations"/> + <group value="newsletter"/> + <group value="configuration"/> + </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/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml index cffce8da1d710..42df2061e4350 100644 --- a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml +++ b/app/code/Magento/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 new file mode 100644 index 0000000000000..fa9b7c377e32b --- /dev/null +++ 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 index c58479a7b73e5..f46e25a832134 100644 --- 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> From 3deb545952d45c8b3f6f2c8948a537550a4fdb99 Mon Sep 17 00:00:00 2001 From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com> Date: Wed, 8 Jul 2020 21:17:14 +0300 Subject: [PATCH 2/2] Added testCaseId to MFTF test. --- ...efrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml index bb4b550f04063..8d6e707930bba 100644 --- a/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml +++ b/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml @@ -16,6 +16,7 @@ <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"/>