Merge remote-tracking branch 'origin/MAGETWO-51089' into develop

Yaroslav Onischenko · Yaroslav Onischenko · commit 584f92b6e795 · 2016-04-25T13:02:28.000+03:00
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
@@ -161,7 +161,12 @@ protected function _prepareLayout()
      */
     public function getPreviewUrl()
     {
-        return $this->getUrl('*/*/preview');
+        if ($this->getTemplateId()) {
+            $params = ['template_id' => $this->getTemplateId()];
+        } else {
+            $params = ['id' => $this->getRequest()->getParam('id')];
+        }
+        return $this->getUrl('*/*/preview', $params);
     }
 
     /**
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
@@ -35,6 +35,10 @@ protected function _prepareForm()
         if ($data = $this->getFormData()) {
             $mapper = ['preview_store_id' => 'store_id'];
 
+            if (empty($data['id']) && !empty($data['text'])) {
+                $this->_backendSession->setPreviewData($data);
+            }
+
             foreach ($data as $key => $value) {
                 if (array_key_exists($key, $mapper)) {
                     $name = $mapper[$key];
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
@@ -238,7 +238,7 @@ public function getSaveUrl()
      */
     public function getPreviewUrl()
     {
-        return $this->getUrl('*/*/preview');
+        return $this->getUrl('*/*/preview', ['id' => $this->getRequest()->getParam('id')]);
     }
 
     /**
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
@@ -58,9 +58,11 @@ protected function _toHtml()
         if ($id = (int)$this->getRequest()->getParam('id')) {
             $this->loadTemplate($template, $id);
         } else {
-            $template->setTemplateType($this->getRequest()->getParam('type'));
-            $template->setTemplateText($this->getRequest()->getParam('text'));
-            $template->setTemplateStyles($this->getRequest()->getParam('styles'));
+            $previewData = $this->getPreviewData();
+
+            $template->setTemplateType($previewData['type']);
+            $template->setTemplateText($previewData['text']);
+            $template->setTemplateStyles($previewData['styles']);
         }
 
         \Magento\Framework\Profiler::start($this->profilerName);
@@ -88,6 +90,32 @@ protected function _toHtml()
         return $templateProcessed;
     }
 
+    /**
+     * Return template preview data
+     *
+     * @return array
+     */
+    private function getPreviewData()
+    {
+        $previewData = [];
+        $previewParams = ['type', 'text', 'styles'];
+
+        $sessionData = [];
+        if ($this->_backendSession->hasPreviewData()) {
+            $sessionData = $this->_backendSession->getPreviewData();
+        }
+
+        foreach ($previewParams as $param) {
+            if (isset($sessionData[$param])) {
+                $previewData[$param] = $sessionData[$param];
+            } else {
+                $previewData[$param] = $this->getRequest()->getParam($param);
+            }
+        }
+
+        return $previewData;
+    }
+
     /**
      * Get Store Id from request or default
      *
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php
@@ -35,6 +35,10 @@ protected function _prepareForm()
         if ($data = $this->getFormData()) {
             $mapper = ['preview_store_id' => 'store_id'];
 
+            if (empty($data['id']) && !empty($data['text'])) {
+                $this->_backendSession->setPreviewData($data);
+            }
+
             foreach ($data as $key => $value) {
                 if (array_key_exists($key, $mapper)) {
                     $name = $mapper[$key];
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Preview.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Preview.php
@@ -17,7 +17,11 @@ public function execute()
     {
         $this->_view->loadLayout();
         $data = $this->getRequest()->getParams();
-        if (empty($data) || !isset($data['id'])) {
+
+        $isEmptyRequestData = empty($data) || !isset($data['id']);
+        $isEmptyPreviewData = !$this->_getSession()->hasPreviewData() || empty($this->_getSession()->getPreviewData());
+        
+        if ($isEmptyRequestData && $isEmptyPreviewData) {
             $this->_forward('noroute');
             return;
         }
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
@@ -82,6 +82,7 @@ public function execute()
 
             $this->messageManager->addSuccess(__('You saved the newsletter queue.'));
             $this->_getSession()->setFormData(false);
+            $this->_getSession()->unsPreviewData();
 
             $this->_redirect('*/*');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
@@ -18,7 +18,10 @@ public function execute()
         $this->_view->loadLayout();
 
         $data = $this->getRequest()->getParams();
-        if (empty($data) || !isset($data['id'])) {
+        $isEmptyRequestData = empty($data) || !isset($data['id']);
+        $isEmptyPreviewData = !$this->_getSession()->hasPreviewData() || empty($this->_getSession()->getPreviewData());
+        
+        if ($isEmptyRequestData && $isEmptyPreviewData) {
             $this->_forward('noroute');
             return $this;
         }
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
@@ -63,7 +63,7 @@ public function execute()
 
             $this->messageManager->addSuccess(__('The newsletter template has been saved.'));
             $this->_getSession()->setFormData(false);
-
+            $this->_getSession()->unsPreviewData();
             $this->_redirect('*/template');
             return;
         } catch (LocalizedException $e) {
diff --git a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
@@ -62,6 +62,12 @@ protected function setUp()
         $appState = $this->getMock('Magento\Framework\App\State', [], [], '', false);
         $context->expects($this->once())->method('getAppState')->will($this->returnValue($appState));
 
+        $backendSession = $this->getMockBuilder('Magento\Backend\Model\Session')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $context->expects($this->once())->method('getBackendSession')->willReturn($backendSession);
+
         $templateFactory = $this->getMock('Magento\Newsletter\Model\TemplateFactory', ['create'], [], '', false);
         $this->template = $this->getMock('Magento\Newsletter\Model\Template', [], [], '', false);
         $templateFactory->expects($this->once())->method('create')->will($this->returnValue($this->template));
diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview.xml
@@ -10,6 +10,7 @@
         <attribute name="id" value="html-body"/>
         <attribute name="class" value="preview-window"/>
         <referenceContainer name="backend.page" remove="true"/>
+        <referenceContainer name="menu.wrapper" remove="true"/>
         <referenceContainer name="root">
             <block name="preview.page.content" class="Magento\Backend\Block\Page" template="Magento_Newsletter::preview/iframeswitcher.phtml">
                 <block class="Magento\Newsletter\Block\Adminhtml\Queue\Preview\Form" name="preview_form"/>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview.xml
@@ -10,6 +10,7 @@
         <attribute name="id" value="html-body"/>
         <attribute name="class" value="preview-window"/>
         <referenceContainer name="backend.page" remove="true"/>
+        <referenceContainer name="menu.wrapper" remove="true"/>
         <referenceContainer name="root">
             <block name="preview.page.content" class="Magento\Backend\Block\Page" template="Magento_Newsletter::preview/iframeswitcher.phtml">
                 <block class="Magento\Newsletter\Block\Adminhtml\Template\Preview\Form" name="preview_form"/>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
@@ -42,8 +42,8 @@ function unBlockPreview() {
     jQuery('body').trigger('hideLoadingPopup');
 }
 
-Event.observe(window, 'load', preview);
-Event.observe(previewIframe, 'load', unBlockPreview);
+jQuery(document).ready(preview);
+jQuery(previewIframe).ready(unBlockPreview);
 
 jQuery("#preview_iframe").load(function() {
     jQuery(this).height(jQuery(this).contents().find("html").height() );
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Template/FormPageActions.php
@@ -17,9 +17,26 @@
 class FormPageActions extends AbstractFormPageActions
 {
     /**
-     * "Save" button
+     * "Save Template" button
      *
      * @var string
      */
     protected $saveButton = "[data-ui-id='page-actions-toolbar-save-button']";
+
+    /**
+     * "Preview Template" button
+     *
+     * @var string
+     */
+    private $previewButton = "[data-role='template-preview']";
+
+    /**
+     * Click preview button on form page
+     *
+     * @return void
+     */
+    public function clickPreview()
+    {
+        $this->_rootElement->find($this->previewButton)->click();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Newsletter\Test\TestCase;
+
+use Magento\Newsletter\Test\Fixture\Template;
+use Magento\Newsletter\Test\Page\Adminhtml\TemplateIndex;
+use Magento\Newsletter\Test\Page\Adminhtml\TemplateNewIndex;
+use Magento\Mtf\TestCase\Injectable;
+
+/**
+ * Newsletter Templates Preview on Newsletter Template page
+ *
+ * Test Flow:
+ * Preconditions:
+ * 1. Create newsletter
+ *
+ * Steps:
+ * 1. Open Backend
+ * 2. Go to "Marketing" -> "Newsletter Template"
+ * 3. Find created template in grid and open it
+ * 4. Click "Preview Template" button at the top of the page
+ * 5. Perform all assertions
+ *
+ * @group Newsletters_(MX)
+ * @ZephyrId MAGETWO-51979
+ */
+class PreviewNewsletterTemplateEntityTest extends Injectable
+{
+    /* tags */
+    const MVP = 'yes';
+    const DOMAIN = 'MX';
+    /* end tags */
+
+    /**
+     * Page with newsletter template grid
+     *
+     * @var TemplateIndex
+     */
+    protected $templateIndex;
+
+    /**
+     * Page for create newsletter template
+     *
+     * @var TemplateNewIndex
+     */
+    protected $templateNewIndex;
+
+    /**
+     * Inject newsletter page
+     *
+     * @param TemplateIndex $templateIndex
+     * @param TemplateNewIndex $templateNewIndex
+     * @return void
+     */
+    public function __inject(
+        TemplateIndex $templateIndex,
+        TemplateNewIndex $templateNewIndex
+    ) {
+        $this->templateIndex = $templateIndex;
+        $this->templateNewIndex = $templateNewIndex;
+    }
+
+    /**
+     * Action for Newsletter Template
+     *
+     * @param Template $newsletter
+     * @return void
+     */
+    public function test(Template $newsletter)
+    {
+        // Preconditions
+        $newsletter->persist();
+
+        // Steps
+        // 1. Open Backend
+        // 2. Go to "Marketing" -> "Newsletter Template"
+        $this->templateIndex->open();
+        // 3. Find created template in grid and open it
+        $this->templateIndex->getNewsletterTemplateGrid()->searchAndOpen(['code' => $newsletter->getCode()]);
+        // 4. Click "Preview Template" button at the top of the page
+        $this->templateNewIndex->getFormPageActions()->clickPreview();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/PreviewNewsletterTemplateEntityTest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Newsletter\Test\TestCase\PreviewNewsletterTemplateEntityTest" summary="Newsletter Template Preview" ticketId="MAGETWO-51979">
+        <variation name="PreviewNewsletterTemplateEntityTestVariation1">
+            <data name="newsletter/dataset" xsi:type="string">default</data>
+            <constraint name="Magento\Newsletter\Test\Constraint\AssertNewsletterPreview" />
+        </variation>
+    </testCase>
+</config>

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,12 @@ protected function _prepareLayout()`
`161`	`161`	`*/`
`162`	`162`	`public function getPreviewUrl()`
`163`	`163`	`{`
`164`		`- return $this->getUrl('//preview');`
	`164`	`+ if ($this->getTemplateId()) {`
	`165`	`+ $params = ['template_id' => $this->getTemplateId()];`
	`166`	`+ } else {`
	`167`	`+ $params = ['id' => $this->getRequest()->getParam('id')];`
	`168`	`+ }`
	`169`	`+ return $this->getUrl('//preview', $params);`
`165`	`170`	`}`
`166`	`171`
`167`	`172`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public function getSaveUrl()`
`238`	`238`	`*/`
`239`	`239`	`public function getPreviewUrl()`
`240`	`240`	`{`
`241`		`- return $this->getUrl('//preview');`
	`241`	`+ return $this->getUrl('//preview', ['id' => $this->getRequest()->getParam('id')]);`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,11 @@ public function execute()`
`17`	`17`	`{`
`18`	`18`	`$this->_view->loadLayout();`
`19`	`19`	`$data = $this->getRequest()->getParams();`
`20`		`- if (empty($data) \|\| !isset($data['id'])) {`
	`20`	`+`
	`21`	`+ $isEmptyRequestData = empty($data) \|\| !isset($data['id']);`
	`22`	`+ $isEmptyPreviewData = !$this->_getSession()->hasPreviewData() \|\| empty($this->_getSession()->getPreviewData());`
	`23`	`+`
	`24`	`+ if ($isEmptyRequestData && $isEmptyPreviewData) {`
`21`	`25`	`$this->_forward('noroute');`
`22`	`26`	`return;`
`23`	`27`	`}`