MC-23058: Template strict mode is not set for unsaved template previews

Author: nathanjosiah

app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MC-15794"/>
             <useCaseId value="MC-11050"/>
             <group value="email"/>
+            <group value="WYSIWYGDisabled"/>
         </annotations>
 
         <before>
@@ -47,6 +48,7 @@
             <severity value="CRITICAL"/>
             <useCaseId value="MC-23058"/>
             <group value="email"/>
+            <group value="WYSIWYGDisabled"/>
             <stories value="Email Template Preview"/>
         </annotations>
 
@@ -80,6 +82,7 @@
             <severity value="CRITICAL"/>
             <useCaseId value="MC-23058"/>
             <group value="email"/>
+            <group value="WYSIWYGDisabled"/>
             <stories value="Email Template Preview"/>
         </annotations>
 

app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminNewsletterTemplateActionGroup.xml

@@ -13,4 +13,38 @@
         <switchToIFrame userInput="preview_iframe" stepKey="switchToIframe" />
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
+    <actionGroup name="NavigateToNewsletterGrid">
+        <amOnPage url="{{NewsletterTemplateForm.url}}" stepKey="amOnNewsletterTemplatePage"/>
+        <waitForPageLoad stepKey="waitForNewNewsletterPageLoad"/>
+    </actionGroup>
+
+    <actionGroup name="FillNewsletterForm">
+        <arguments>
+            <argument name="Newsletter" defaultValue="BasicFieldNewsletterSection"/>
+        </arguments>
+        <waitForElementVisible selector="{{BasicFieldNewsletterSection.templateName}}" stepKey="waitForTemplateNameField"/>
+        <fillField selector="{{BasicFieldNewsletterSection.templateName}}" userInput="{{Newsletter.name}}" stepKey="fillTemplateName" />
+        <fillField selector="{{BasicFieldNewsletterSection.templateSubject}}" userInput="{{Newsletter.subject}}" stepKey="fillTemplateSubject" />
+        <fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{Newsletter.senderName}}" stepKey="fillSenderName" />
+        <fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{Newsletter.senderEmail}}" stepKey="fillSenderEmail" />
+        <fillField selector="{{BasicFieldNewsletterSection.templateText}}" userInput="{{Newsletter.templateText}}" stepKey="fillTemplateText" />
+    </actionGroup>
+
+    <actionGroup name="OpenNewsletterPreviewTab">
+        <waitForElementVisible selector="{{BasicFieldNewsletterSection.templateName}}" stepKey="waitForPreviewButton"/>
+        <click selector="{{BasicFieldNewsletterSection.preview}}" stepKey="clickPreview"/>
+        <switchToNextTab stepKey="switchToPreviewTab"/>
+        <waitForPageLoad stepKey="waitForPreviewTabLoaded"/>
+        <executeJS function="document.getElementById('preview_iframe').sandbox.add('allow-scripts')" stepKey="addSandboxValue"/>
+        <switchToIFrame userInput="preview_iframe" stepKey="switchToIframe"/>
+        <waitForPageLoad stepKey="waitForPreviewIframeLoaded"/>
+    </actionGroup>
+
+    <actionGroup name="AssertNewsletterContent">
+        <arguments>
+            <argument name="Newsletter" defaultValue="BasicFieldNewsletterSection"/>
+        </arguments>
+        <see userInput="{{Newsletter.expectedTemplate}}" stepKey="checkTemplateContainsText"/>
+    </actionGroup>
+
 </actionGroups>

app/code/Magento/Newsletter/Test/Mftf/Test/AdminNewsletterPreviewTest.xml

@@ -11,6 +11,7 @@
         <annotations>
             <features value="Newsletter"/>
             <group value="Newsletter"/>
+            <group value="WYSIWYGDisabled"/>
             <title value="Admin should be able to preview Newsletter content in draft mode"/>
             <description value="Admin should be able to preview newsletter content in draft mode"/>
             <severity value="CRITICAL"/>
@@ -26,20 +27,18 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
-        <!--Create a newsletter template that contains an image-->
-        <amOnPage url="{{NewsletterTemplateForm.url}}" stepKey="amOnNewsletterTemplatePage"/>
-        <waitForPageLoad stepKey="waitForNewNewsletterPageLoad"/>
-        <fillField selector="{{BasicFieldNewsletterSection.templateName}}" userInput="{{NewsletterWithDirectives.name}}" stepKey="fillTemplateName" />
-        <fillField selector="{{BasicFieldNewsletterSection.templateSubject}}" userInput="{{NewsletterWithDirectives.subject}}" stepKey="fillTemplateSubject" />
-        <fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{NewsletterWithDirectives.senderName}}" stepKey="fillSenderName" />
-        <fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{NewsletterWithDirectives.senderEmail}}" stepKey="fillSenderEmail" />
-        <fillField selector="{{BasicFieldNewsletterSection.templateText}}" userInput="{{NewsletterWithDirectives.templateText}}" stepKey="fillTemplateText" />
-        <click selector="{{BasicFieldNewsletterSection.preview}}" stepKey="clickPreview"/>
-        <switchToNextTab stepKey="switchToPreviewTab"/>
-        <waitForPageLoad stepKey="waitForPreviewTabLoaded"/>
-        <switchToIFrame userInput="preview_iframe" stepKey="switchToIframe"/>
-        <waitForPageLoad stepKey="waitForPreviewIframeLoaded"/>
-        <see userInput="{{NewsletterWithDirectives.expectedTemplate}}" stepKey="checkTemplateContainsText"/>
+        <actionGroup ref="NavigateToNewsletterGrid" stepKey="navigateToGrid"/>
+
+        <actionGroup ref="FillNewsletterForm" stepKey="fillForm">
+            <argument name="Newsletter" value="NewsletterWithDirectives"/>
+        </actionGroup>
+
+        <actionGroup ref="OpenNewsletterPreviewTab" stepKey="openPreviewTab"/>
+
+        <actionGroup ref="AssertNewsletterContent" stepKey="assertTemplateContent">
+            <argument name="Newsletter" value="NewsletterWithDirectives"/>
+        </actionGroup>
+
         <closeTab stepKey="closeTab"/>
     </test>
 </tests>