merge magento-commerce/2.4.1-develop into magento-honey-badgers/MC-36897

magento-mts-svc · web-flow · commit 5dec8705c772 · 2020-08-28T08:36:44.000-07:00
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
@@ -67,6 +67,7 @@ protected function _toHtml()
             $template->setTemplateType($request->getParam('type'));
             $template->setTemplateText($request->getParam('text'));
             $template->setTemplateStyles($request->getParam('styles'));
+            $template->setData('is_legacy', false);
         }
 
         \Magento\Framework\Profiler::start($this->profilerName);
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -361,8 +361,15 @@ public function getProcessedTemplate(array $variables = [])
         $variables = $this->addEmailVariables($variables, $storeId);
         $processor->setVariables($variables);
 
+        // Type        legacy  id      strict
+        // db legacy   true    numeric false
+        // db new      false   numeric true
+        // filesystem  false   string  false
+        // preview     false   null    true
+        $isLegacy = $this->getData('is_legacy');
+        $templateId = $this->getTemplateId();
         $previousStrictMode = $processor->setStrictMode(
-            !$this->getData('is_legacy') && is_numeric($this->getTemplateId())
+            !$isLegacy && (is_numeric($templateId) || empty($templateId))
         );
 
         try {
diff --git a/app/code/Magento/Email/Test/Mftf/ActionGroup/PrepareDraftCustomTemplateActionGroup.xml b/app/code/Magento/Email/Test/Mftf/ActionGroup/PrepareDraftCustomTemplateActionGroup.xml
@@ -0,0 +1,25 @@
+<?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="PrepareDraftCustomTemplateActionGroup" extends="CreateNewTemplateActionGroup">
+        <arguments>
+            <argument name="template" defaultValue="EmailTemplate"/>
+        </arguments>
+        <remove keyForRemoval="selectValueFromTemplateDropDown"/>
+        <remove keyForRemoval="clickLoadTemplateButton"/>
+        <remove keyForRemoval="clickSaveTemplateButton"/>
+        <remove keyForRemoval="waitForSuccessMessage"/>
+        <remove keyForRemoval="seeSuccessMessage"/>
+
+        <fillField selector="{{AdminEmailTemplateEditSection.templateSubject}}" userInput="{{template.templateSubject}}" after="fillTemplateNameField" stepKey="fillTemplateSubject"/>
+        <fillField selector="{{AdminEmailTemplateEditSection.templateText}}" userInput="{{template.templateText}}" after="fillTemplateSubject" stepKey="fillTemplateText"/>
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/Email/Test/Mftf/Data/EmailTemplateData.xml b/app/code/Magento/Email/Test/Mftf/Data/EmailTemplateData.xml
@@ -13,4 +13,10 @@
         <data key="templateSubject" unique="suffix">Template Subject_</data>
         <data key="templateText" unique="suffix">Template Text_</data>
     </entity>
+    <entity name="EmailTemplateWithDirectives" type="template">
+        <data key="templateName" unique="suffix">Template</data>
+        <data key="templateSubject" unique="suffix">Template Subject_</data>
+        <data key="templateText">Template {{var this.template_id}}:{{var this.getData(template_id)}} Text</data>
+        <data key="expectedTemplate">Template : Text</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewAsDraftWithDirectivesTest.xml b/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewAsDraftWithDirectivesTest.xml
@@ -0,0 +1,47 @@
+<?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="AdminEmailTemplatePreviewAsDraftWithDirectivesTest">
+        <annotations>
+            <features value="Email"/>
+            <stories value="Create email template with directives and preview as draft"/>
+            <title value="Check email template preview with directives and preview as draft"/>
+            <description value="Check if email template preview works correctly with directives in draft mode"/>
+            <severity value="CRITICAL"/>
+            <useCaseId value="MC-23058"/>
+            <group value="email"/>
+            <group value="WYSIWYGDisabled"/>
+            <stories value="Email Template Preview"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminArea"/>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+        </after>
+
+        <actionGroup ref="PrepareDraftCustomTemplateActionGroup" stepKey="createDraftTemplate">
+            <argument name="template" value="EmailTemplateWithDirectives"/>
+        </actionGroup>
+
+        <click selector="{{AdminEmailTemplateEditSection.previewTemplateButton}}" stepKey="clickPreviewTemplate"/>
+        <switchToNextTab stepKey="switchToPreviewTab"/>
+        <seeInCurrentUrl url="{{AdminEmailTemplatePreviewPage.url}}" stepKey="seePreviewInUrl"/>
+        <seeElement selector="{{AdminEmailTemplatePreviewSection.iframe}}" stepKey="seeIframeOnPage"/>
+        <switchToIFrame userInput="preview_iframe" stepKey="switchToIframe"/>
+        <waitForPageLoad stepKey="waitForPreviewLoaded"/>
+
+        <actionGroup ref="AssertEmailTemplateContentActionGroup" stepKey="assertContent">
+            <argument name="expectedContent" value="{{EmailTemplateWithDirectives.expectedTemplate}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewTest.xml b/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>
diff --git a/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewWithDirectivesTest.xml b/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewWithDirectivesTest.xml
@@ -0,0 +1,45 @@
+<?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="AdminEmailTemplatePreviewWithDirectivesTest">
+        <annotations>
+            <features value="Email"/>
+            <stories value="Create email template with directives"/>
+            <title value="Check email template preview with directives"/>
+            <description value="Check if email template preview works correctly with directives"/>
+            <severity value="CRITICAL"/>
+            <useCaseId value="MC-23058"/>
+            <group value="email"/>
+            <group value="WYSIWYGDisabled"/>
+            <stories value="Email Template Preview"/>
+        </annotations>
+
+        <before>
+            <!--Login to Admin Area-->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminArea"/>
+        </before>
+
+        <after>
+            <!--Delete created Template-->
+            <actionGroup ref="DeleteEmailTemplateActionGroup" stepKey="deleteTemplate"/>
+            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clearFilters"/>
+            <!--Logout from Admin Area-->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+        </after>
+
+        <actionGroup ref="CreateCustomTemplateActionGroup" stepKey="createTemplate">
+            <argument name="template" value="EmailTemplateWithDirectives"/>
+        </actionGroup>
+        <actionGroup ref="PreviewEmailTemplateActionGroup" stepKey="previewTemplate"/>
+        <actionGroup ref="AssertEmailTemplateContentActionGroup" stepKey="assertContent">
+            <argument name="expectedContent" value="{{EmailTemplateWithDirectives.expectedTemplate}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
@@ -56,6 +56,7 @@ protected function loadTemplate(\Magento\Newsletter\Model\Template $template, $i
         $template->setTemplateType($queue->getNewsletterType());
         $template->setTemplateText($queue->getNewsletterText());
         $template->setTemplateStyles($queue->getNewsletterStyles());
+        $template->setData('is_legacy', false);
 
         return $this;
     }
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
@@ -65,6 +65,7 @@ protected function _toHtml()
             $template->setTemplateType($previewData['type']);
             $template->setTemplateText($previewData['text']);
             $template->setTemplateStyles($previewData['styles']);
+            $template->setData('is_legacy', false);
         }
 
         \Magento\Framework\Profiler::start($this->profilerName);
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
@@ -22,7 +22,7 @@
         frameborder="0"
         title="<?= $block->escapeHtmlAttr(__('Preview')) ?>"
         width="100%"
-        sandbox="allow-forms allow-pointer-lock"
+        sandbox="allow-forms allow-pointer-lock allow-same-origin"
     >
 
     </iframe>
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
@@ -75,7 +75,11 @@ protected function mockModel($filesystem = null)
         $this->objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
 
         $this->model->expects($this->any())->method('_getMail')->willReturnCallback([$this, 'getMail']);
-        $this->model->setSenderName('sender')->setSenderEmail('sender@example.com')->setTemplateSubject('Subject');
+        $this->model
+            ->setSenderName('sender')
+            ->setSenderEmail('sender@example.com')
+            ->setTemplateSubject('Subject')
+            ->setTemplateId('abc');
     }
 
     /**
@@ -120,6 +124,7 @@ public function testLoadDefault()
     public function testGetProcessedTemplate()
     {
         $this->mockModel();
+        $this->model->setTemplateId(null);
         $this->objectManager->get(\Magento\Framework\App\AreaList::class)
             ->getArea(Area::AREA_FRONTEND)
             ->load();
@@ -416,6 +421,40 @@ public function testLegacyTemplateLoadedFromDbIsFilteredInLegacyMode()
         self::assertEquals('1 - some_unique_code - 1 - some_unique_code', $this->model->getProcessedTemplate());
     }
 
+    /**
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     * @magentoComponentsDir Magento/Email/Model/_files/design
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     */
+    public function testPreviewTemplateIsFilteredInStrictMode()
+    {
+        $this->mockModel();
+
+        $this->setUpThemeFallback(BackendFrontNameResolver::AREA_CODE);
+
+        $this->model->setTemplateType(TemplateTypesInterface::TYPE_HTML);
+        $template = '{{var store.isSaveAllowed()}} - {{template config_path="design/email/footer_template"}}';
+        $this->model->setTemplateText($template);
+
+        $template = $this->objectManager->create(\Magento\Email\Model\Template::class);
+        $templateData = [
+            'is_legacy' => '0',
+            'template_code' => 'some_unique_code',
+            'template_type' => TemplateTypesInterface::TYPE_HTML,
+            'template_text' => '{{var this.template_code}}'
+                . ' - {{var store.isSaveAllowed()}} - {{var this.getTemplateCode()}}',
+        ];
+        $template->setData($templateData);
+        $template->save();
+
+        // Store the ID of the newly created template in the system config so that this template will be loaded
+        $this->objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
+            ->setValue('design/email/footer_template', $template->getId(), ScopeInterface::SCOPE_STORE, 'fixturestore');
+
+        self::assertEquals('1 - some_unique_code -  - some_unique_code', $this->model->getProcessedTemplate());
+    }
+
     /**
      * Ensure that the template_styles variable contains styles from either <!--@styles @--> or the "Template Styles"
      * textarea in backend, depending on whether template was loaded from filesystem or DB.
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/Template/DropTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/Template/DropTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Newsletter\Controller\Adminhtml\Template;
+
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Newsletter\Model\Template;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+class DropTest extends AbstractBackendController
+{
+    public function testDefaultTemplateAction()
+    {
+        $website = $this->_objectManager
+            ->get(StoreManagerInterface::class)
+            ->getWebsite();
+
+        $storeId = $website->getDefaultStore()
+            ->getId();
+
+        /** @var $formKey FormKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'form_key' => $formKey->getFormKey(),
+            'type' => Template::TYPE_HTML,
+            'preview_store_id' => $storeId,
+            'text' => 'Template {{var this.template_id}}:{{var this.getData(template_id)}} Text'
+        ];
+        $this->getRequest()->setPostValue($post);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch('backend/newsletter/template/drop');
+        $this->assertStringContainsString(
+            'Template : Text',
+            $this->getResponse()->getBody()
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
@@ -147,6 +147,7 @@ public function testLegacyTemplateFromDbLoadsInLegacyMode()
         $this->_model->setTemplateType(TemplateTypesInterface::TYPE_HTML);
         $templateText = '{{var store.isSaveAllowed()}} - {{template config_path="foobar"}}';
         $this->_model->setTemplateText($templateText);
+        $this->_model->setTemplateId('abc');
 
         $template = $objectManager->create(\Magento\Email\Model\Template::class);
         $templateData = [
@@ -184,6 +185,7 @@ public function testTemplateFromDbLoadsInStrictMode()
         $this->_model->setTemplateType(TemplateTypesInterface::TYPE_HTML);
         $templateText = '{{var store.isSaveAllowed()}} - {{template config_path="foobar"}}';
         $this->_model->setTemplateText($templateText);
+        $this->_model->setTemplateId('abc');
 
         $template = $objectManager->create(\Magento\Email\Model\Template::class);
         $templateData = [

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ protected function _toHtml()`
`67`	`67`	`$template->setTemplateType($request->getParam('type'));`
`68`	`68`	`$template->setTemplateText($request->getParam('text'));`
`69`	`69`	`$template->setTemplateStyles($request->getParam('styles'));`
	`70`	`+ $template->setData('is_legacy', false);`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`\Magento\Framework\Profiler::start($this->profilerName);`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ protected function loadTemplate(\Magento\Newsletter\Model\Template $template, $i`
`56`	`56`	`$template->setTemplateType($queue->getNewsletterType());`
`57`	`57`	`$template->setTemplateText($queue->getNewsletterText());`
`58`	`58`	`$template->setTemplateStyles($queue->getNewsletterStyles());`
	`59`	`+ $template->setData('is_legacy', false);`
`59`	`60`
`60`	`61`	`return $this;`
`61`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ protected function _toHtml()`
`65`	`65`	`$template->setTemplateType($previewData['type']);`
`66`	`66`	`$template->setTemplateText($previewData['text']);`
`67`	`67`	`$template->setTemplateStyles($previewData['styles']);`
	`68`	`+ $template->setData('is_legacy', false);`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`\Magento\Framework\Profiler::start($this->profilerName);`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`frameborder="0"`
`23`	`23`	`title="<?= $block->escapeHtmlAttr(__('Preview')) ?>"`
`24`	`24`	`width="100%"`
`25`		`- sandbox="allow-forms allow-pointer-lock"`
	`25`	`+ sandbox="allow-forms allow-pointer-lock allow-same-origin"`
`26`	`26`	`>`
`27`	`27`
`28`	`28`	`</iframe>`