From 171c7f9c02d4288646185d486bc64d8b9816b096 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Tue, 18 Aug 2015 19:37:55 +0300
Subject: [PATCH 01/21] MAGETWO-41501: Wrong success mass delete message on cms
 pages and blocks

---
 .../Controller/Adminhtml/Block/MassDelete.php |   9 +-
 .../Controller/Adminhtml/Page/MassDelete.php  |   9 +-
 .../Adminhtml/AbstractMassDeleteTest.php      |  68 +++++++++++
 .../Adminhtml/Block/MassDeleteTest.php        | 114 ++++++++++++++++++
 .../Adminhtml/Page/MassDeleteTest.php         | 114 ++++++++++++++++++
 5 files changed, 306 insertions(+), 8 deletions(-)
 create mode 100644 app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassDeleteTest.php
 create mode 100644 app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
 create mode 100644 app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
index d9a8c044873cf..42319679b922c 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
@@ -47,12 +47,13 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
     public function execute()
     {
         $collection = $this->filter->getCollection($this->collectionFactory->create());
-
-        foreach ($collection as $item) {
-            $item->delete();
+        $deletedBlocks = 0;
+        foreach ($collection as $block) {
+            $block->delete();
+            $deletedBlocks++;
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collection->getSize()));
+        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $deletedBlocks));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
index e5cfcf22966f5..e699a3a480e5f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
@@ -46,12 +46,13 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
     public function execute()
     {
         $collection = $this->filter->getCollection($this->collectionFactory->create());
-
-        foreach ($collection as $item) {
-            $item->delete();
+        $deletedPages = 0;
+        foreach ($collection as $page) {
+            $page->delete();
+            $deletedPages++;
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collection->getSize()));
+        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $deletedPages));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassDeleteTest.php
new file mode 100644
index 0000000000000..0668edee3be7a
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassDeleteTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Cms\Test\Unit\Controller\Adminhtml;
+
+use Magento\Framework\Controller\ResultFactory;
+
+abstract class AbstractMassDeleteTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $contextMock;
+
+    /**
+     * @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultFactoryMock;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultRedirectMock;
+
+    /**
+     * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $messageManagerMock;
+
+    /**
+     * @var \Magento\Ui\Component\MassAction\Filter|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $filterMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->messageManagerMock = $this->getMock('Magento\Framework\Message\ManagerInterface', [], [], '', false);
+
+        $this->resultFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\ResultFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resultRedirectMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\Redirect')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resultFactoryMock->expects($this->any())
+            ->method('create')
+            ->with(ResultFactory::TYPE_REDIRECT, [])
+            ->willReturn($this->resultRedirectMock);
+
+        $this->contextMock = $this->getMock('\Magento\Backend\App\Action\Context', [], [], '', false);
+
+        $this->filterMock = $this->getMockBuilder('Magento\Ui\Component\MassAction\Filter')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock->expects($this->any())->method('getMessageManager')->willReturn($this->messageManagerMock);
+        $this->contextMock->expects($this->any())->method('getResultFactory')->willReturn($this->resultFactoryMock);
+    }
+}
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
new file mode 100644
index 0000000000000..7db8d7b28cac5
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Cms\Test\Unit\Controller\Adminhtml\Block;
+
+use Magento\Cms\Test\Unit\Controller\Adminhtml\AbstractMassDeleteTest;
+
+class MassDeleteTest extends AbstractMassDeleteTest
+{
+    /**
+     * @var \Magento\Cms\Controller\Adminhtml\Block\MassDelete
+     */
+    protected $massDeleteController;
+
+    /**
+     * @var \Magento\Cms\Model\Resource\Block\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $collectionFactoryMock;
+
+    /**
+     * @var \Magento\Cms\Model\Resource\Block\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $blockCollectionMock;
+
+    /**
+     * @var \Magento\Cms\Model\Resource\Block\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $headerBlockCollectionMock;
+
+    /**
+     * @var \Magento\Cms\Model\Resource\Block\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $footerBlockCollectionMock;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->collectionFactoryMock = $this->getMock(
+            'Magento\Cms\Model\Resource\Block\CollectionFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
+
+        $this->blockCollectionMock = $this->getMock(
+            'Magento\Cms\Model\Resource\Block\Collection',
+            ['delete'],
+            [],
+            '',
+            false
+        );
+
+        $this->headerBlockCollectionMock = $this->getMock(
+            'Magento\Cms\Model\Resource\Block\Collection',
+            ['delete'],
+            [],
+            '',
+            false
+        );
+
+        $this->footerBlockCollectionMock = $this->getMock(
+            'Magento\Cms\Model\Resource\Block\Collection',
+            ['delete'],
+            [],
+            '',
+            false
+        );
+
+        $this->massDeleteController = $this->objectManager->getObject(
+            'Magento\Cms\Controller\Adminhtml\Block\MassDelete',
+            [
+                'context' => $this->contextMock,
+                'filter' => $this->filterMock,
+                'collectionFactory' => $this->collectionFactoryMock
+            ]
+        );
+    }
+
+    public function testMassDeleteAction()
+    {
+        $deletedBlocks = 2;
+
+        $collection = [
+            $this->headerBlockCollectionMock,
+            $this->footerBlockCollectionMock
+        ];
+
+        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->blockCollectionMock);
+
+        $this->filterMock->expects($this->once())
+            ->method('getCollection')
+            ->with($this->blockCollectionMock)
+            ->willReturn($collection);
+
+        $this->headerBlockCollectionMock->expects($this->exactly(1))->method('delete')->willReturn(true);
+        $this->footerBlockCollectionMock->expects($this->exactly(1))->method('delete')->willReturn(true);
+
+        $this->messageManagerMock->expects($this->once())
+            ->method('addSuccess')
+            ->with(__('A total of %1 record(s) have been deleted.', $deletedBlocks));
+        $this->messageManagerMock->expects($this->never())->method('addError');
+
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with('*/*/')
+            ->willReturnSelf();
+
+        $this->assertSame($this->resultRedirectMock, $this->massDeleteController->execute());
+    }
+}
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
new file mode 100644
index 0000000000000..0bc28b3c52af7
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Cms\Test\Unit\Controller\Adminhtml\Page;
+
+use Magento\Cms\Test\Unit\Controller\Adminhtml\AbstractMassDeleteTest;
+
+class MassDeleteTest extends AbstractMassDeleteTest
+{
+    /**
+     * @var \Magento\Cms\Controller\Adminhtml\Page\MassDelete
+     */
+    protected $massDeleteController;
+
+    /**
+     * @var \Magento\Cms\Model\Resource\Page\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $collectionFactoryMock;
+
+    /**
+     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $pageCollectionMock;
+
+    /**
+     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $homePageCollectionMock;
+
+    /**
+     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $welcomePageCollectionMock;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->collectionFactoryMock = $this->getMock(
+            'Magento\Cms\Model\Resource\Page\CollectionFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
+
+        $this->pageCollectionMock = $this->getMock(
+            'Magento\Cms\Model\Resource\Page\Collection',
+            ['delete'],
+            [],
+            '',
+            false
+        );
+
+        $this->homePageCollectionMock = $this->getMock(
+            'Magento\Cms\Model\Resource\Page\Collection',
+            ['delete'],
+            [],
+            '',
+            false
+        );
+
+        $this->welcomePageCollectionMock = $this->getMock(
+            'Magento\Cms\Model\Resource\Page\Collection',
+            ['delete'],
+            [],
+            '',
+            false
+        );
+
+        $this->massDeleteController = $this->objectManager->getObject(
+            'Magento\Cms\Controller\Adminhtml\Page\MassDelete',
+            [
+                'context' => $this->contextMock,
+                'filter' => $this->filterMock,
+                'collectionFactory' => $this->collectionFactoryMock
+            ]
+        );
+    }
+
+    public function testMassDeleteAction()
+    {
+        $deletedPages = 2;
+
+        $collection = [
+            $this->homePageCollectionMock,
+            $this->welcomePageCollectionMock
+        ];
+
+        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->pageCollectionMock);
+
+        $this->filterMock->expects($this->once())
+            ->method('getCollection')
+            ->with($this->pageCollectionMock)
+            ->willReturn($collection);
+
+        $this->homePageCollectionMock->expects($this->exactly(1))->method('delete')->willReturn(true);
+        $this->welcomePageCollectionMock->expects($this->exactly(1))->method('delete')->willReturn(true);
+
+        $this->messageManagerMock->expects($this->once())
+            ->method('addSuccess')
+            ->with(__('A total of %1 record(s) have been deleted.', $deletedPages));
+        $this->messageManagerMock->expects($this->never())->method('addError');
+
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with('*/*/')
+            ->willReturnSelf();
+
+        $this->assertSame($this->resultRedirectMock, $this->massDeleteController->execute());
+    }
+}

From cf6a3b7eda5151a7783fa07578c834e5875d6bd4 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Wed, 19 Aug 2015 12:52:06 +0300
Subject: [PATCH 02/21] MAGETWO-41501: Wrong success mass delete message on cms
 pages and blocks

- Unit tests updated;
---
 .../Adminhtml/Block/MassDeleteTest.php        | 63 +++++--------------
 .../Adminhtml/Page/MassDeleteTest.php         | 63 +++++--------------
 2 files changed, 34 insertions(+), 92 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
index 7db8d7b28cac5..f27016e49d44c 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
@@ -19,21 +19,6 @@ class MassDeleteTest extends AbstractMassDeleteTest
      */
     protected $collectionFactoryMock;
 
-    /**
-     * @var \Magento\Cms\Model\Resource\Block\Collection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $blockCollectionMock;
-
-    /**
-     * @var \Magento\Cms\Model\Resource\Block\Collection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $headerBlockCollectionMock;
-
-    /**
-     * @var \Magento\Cms\Model\Resource\Block\Collection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $footerBlockCollectionMock;
-
     protected function setUp()
     {
         parent::setUp();
@@ -46,30 +31,6 @@ protected function setUp()
             false
         );
 
-        $this->blockCollectionMock = $this->getMock(
-            'Magento\Cms\Model\Resource\Block\Collection',
-            ['delete'],
-            [],
-            '',
-            false
-        );
-
-        $this->headerBlockCollectionMock = $this->getMock(
-            'Magento\Cms\Model\Resource\Block\Collection',
-            ['delete'],
-            [],
-            '',
-            false
-        );
-
-        $this->footerBlockCollectionMock = $this->getMock(
-            'Magento\Cms\Model\Resource\Block\Collection',
-            ['delete'],
-            [],
-            '',
-            false
-        );
-
         $this->massDeleteController = $this->objectManager->getObject(
             'Magento\Cms\Controller\Adminhtml\Block\MassDelete',
             [
@@ -85,20 +46,17 @@ public function testMassDeleteAction()
         $deletedBlocks = 2;
 
         $collection = [
-            $this->headerBlockCollectionMock,
-            $this->footerBlockCollectionMock
+            $this->getBlockMock(),
+            $this->getBlockMock()
         ];
 
-        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->blockCollectionMock);
+        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->getBlockMock());
 
         $this->filterMock->expects($this->once())
             ->method('getCollection')
-            ->with($this->blockCollectionMock)
+            ->with($this->getBlockMock())
             ->willReturn($collection);
 
-        $this->headerBlockCollectionMock->expects($this->exactly(1))->method('delete')->willReturn(true);
-        $this->footerBlockCollectionMock->expects($this->exactly(1))->method('delete')->willReturn(true);
-
         $this->messageManagerMock->expects($this->once())
             ->method('addSuccess')
             ->with(__('A total of %1 record(s) have been deleted.', $deletedBlocks));
@@ -111,4 +69,17 @@ public function testMassDeleteAction()
 
         $this->assertSame($this->resultRedirectMock, $this->massDeleteController->execute());
     }
+
+    /**
+     * Create Cms Block Collection Mock
+     *
+     * @return \Magento\Cms\Model\Resource\Block\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getBlockMock()
+    {
+        $blockMock = $this->getMock('Magento\Cms\Model\Resource\Block\Collection', ['delete'], [], '', false);
+        $blockMock->expects($this->any())->method('delete')->willReturn(true);
+
+        return $blockMock;
+    }
 }
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
index 0bc28b3c52af7..f768a6480e6c8 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
@@ -19,21 +19,6 @@ class MassDeleteTest extends AbstractMassDeleteTest
      */
     protected $collectionFactoryMock;
 
-    /**
-     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $pageCollectionMock;
-
-    /**
-     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $homePageCollectionMock;
-
-    /**
-     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $welcomePageCollectionMock;
-
     protected function setUp()
     {
         parent::setUp();
@@ -46,30 +31,6 @@ protected function setUp()
             false
         );
 
-        $this->pageCollectionMock = $this->getMock(
-            'Magento\Cms\Model\Resource\Page\Collection',
-            ['delete'],
-            [],
-            '',
-            false
-        );
-
-        $this->homePageCollectionMock = $this->getMock(
-            'Magento\Cms\Model\Resource\Page\Collection',
-            ['delete'],
-            [],
-            '',
-            false
-        );
-
-        $this->welcomePageCollectionMock = $this->getMock(
-            'Magento\Cms\Model\Resource\Page\Collection',
-            ['delete'],
-            [],
-            '',
-            false
-        );
-
         $this->massDeleteController = $this->objectManager->getObject(
             'Magento\Cms\Controller\Adminhtml\Page\MassDelete',
             [
@@ -85,20 +46,17 @@ public function testMassDeleteAction()
         $deletedPages = 2;
 
         $collection = [
-            $this->homePageCollectionMock,
-            $this->welcomePageCollectionMock
+            $this->getPageMock(),
+            $this->getPageMock()
         ];
 
-        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->pageCollectionMock);
+        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->getPageMock());
 
         $this->filterMock->expects($this->once())
             ->method('getCollection')
-            ->with($this->pageCollectionMock)
+            ->with($this->getPageMock())
             ->willReturn($collection);
 
-        $this->homePageCollectionMock->expects($this->exactly(1))->method('delete')->willReturn(true);
-        $this->welcomePageCollectionMock->expects($this->exactly(1))->method('delete')->willReturn(true);
-
         $this->messageManagerMock->expects($this->once())
             ->method('addSuccess')
             ->with(__('A total of %1 record(s) have been deleted.', $deletedPages));
@@ -111,4 +69,17 @@ public function testMassDeleteAction()
 
         $this->assertSame($this->resultRedirectMock, $this->massDeleteController->execute());
     }
+
+    /**
+     * Create Cms Page Collection Mock
+     *
+     * @return \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getPageMock()
+    {
+        $pageMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', ['delete'], [], '', false);
+        $pageMock->expects($this->any())->method('delete')->willReturn(true);
+
+        return $pageMock;
+    }
 }

From 1e10d72cfa5be7e29b88ee0e759bc4826180ce72 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Fri, 21 Aug 2015 13:20:17 +0300
Subject: [PATCH 03/21] MAGETWO-41916: Production Mode does not Work for
 Authorize.net

---
 .../Authorizenet/etc/adminhtml/system.xml     | 25 +++++++++++--------
 app/code/Magento/Authorizenet/etc/config.xml  |  2 ++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Authorizenet/etc/adminhtml/system.xml b/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
index 591d0951e2d45..cfff3a927453c 100644
--- a/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
+++ b/app/code/Magento/Authorizenet/etc/adminhtml/system.xml
@@ -44,45 +44,48 @@
                 <field id="cgi_url" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Gateway URL</label>
                 </field>
-                <field id="currency" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="cgi_url_td" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
+                    <label>Transaction Details Url</label>
+                </field>
+                <field id="currency" translate="label" type="select" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Accepted Currency</label>
                     <source_model>Magento\Config\Model\Config\Source\Locale\Currency</source_model>
                 </field>
-                <field id="debug" translate="label" type="select" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="debug" translate="label" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Debug</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="email_customer" translate="label" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="email_customer" translate="label" type="select" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Email Customer</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="merchant_email" translate="label" type="text" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="merchant_email" translate="label" type="text" sortOrder="140" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Merchant's Email</label>
                     <validate>validate-email</validate>
                 </field>
-                <field id="cctypes" translate="label" type="multiselect" sortOrder="140" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="cctypes" translate="label" type="multiselect" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Credit Card Types</label>
                     <source_model>Magento\Authorizenet\Model\Source\Cctype</source_model>
                 </field>
-                <field id="useccv" translate="label" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="useccv" translate="label" type="select" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Credit Card Verification</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="allowspecific" translate="label" type="allowspecific" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="allowspecific" translate="label" type="allowspecific" sortOrder="170" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Payment from Applicable Countries</label>
                     <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
                 </field>
-                <field id="specificcountry" translate="label" type="multiselect" sortOrder="170" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="specificcountry" translate="label" type="multiselect" sortOrder="180" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Payment from Specific Countries</label>
                     <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
                 </field>
-                <field id="min_order_total" translate="label" type="text" sortOrder="180" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="min_order_total" translate="label" type="text" sortOrder="190" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Minimum Order Total</label>
                 </field>
-                <field id="max_order_total" translate="label" type="text" sortOrder="190" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="max_order_total" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Maximum Order Total</label>
                 </field>
-                <field id="sort_order" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="0">
+                <field id="sort_order" translate="label" type="text" sortOrder="210" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Sort Order</label>
                     <frontend_class>validate-number</frontend_class>
                 </field>
diff --git a/app/code/Magento/Authorizenet/etc/config.xml b/app/code/Magento/Authorizenet/etc/config.xml
index a620f157b10e4..d672c305df335 100644
--- a/app/code/Magento/Authorizenet/etc/config.xml
+++ b/app/code/Magento/Authorizenet/etc/config.xml
@@ -30,6 +30,8 @@
                 <place_order_url>authorizenet/directpost_payment/place</place_order_url>
                 <cgi_url_test_mode>https://test.authorize.net/gateway/transact.dll</cgi_url_test_mode>
                 <cgi_url>https://secure.authorize.net/gateway/transact.dll</cgi_url>
+                <cgi_url_td_test_mode>https://apitest.authorize.net/xml/v1/request.api</cgi_url_td_test_mode>
+                <cgi_url_td>https://api2.authorize.net/xml/v1/request.api</cgi_url_td>
             </authorizenet_directpost>
         </payment>
     </default>

From 728a3493efcaae44a84c3ef2c5de4111157465ba Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Tue, 25 Aug 2015 19:23:36 +0300
Subject: [PATCH 04/21] MAGETWO-41501: Wrong success mass delete message on cms
 pages and blocks

- Unit tests updated;
---
 .../Controller/Adminhtml/Block/MassDeleteTest.php   | 13 ++++++++++---
 .../Controller/Adminhtml/Page/MassDeleteTest.php    | 13 ++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
index f27016e49d44c..467295679e923 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
@@ -19,6 +19,11 @@ class MassDeleteTest extends AbstractMassDeleteTest
      */
     protected $collectionFactoryMock;
 
+    /**
+     * @var \Magento\Cms\Model\Resource\Block\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $blockCollectionMock;
+
     protected function setUp()
     {
         parent::setUp();
@@ -31,6 +36,8 @@ protected function setUp()
             false
         );
 
+        $this->blockCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Block\Collection', [], [], '', false);
+
         $this->massDeleteController = $this->objectManager->getObject(
             'Magento\Cms\Controller\Adminhtml\Block\MassDelete',
             [
@@ -50,11 +57,11 @@ public function testMassDeleteAction()
             $this->getBlockMock()
         ];
 
-        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->getBlockMock());
+        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->blockCollectionMock);
 
         $this->filterMock->expects($this->once())
             ->method('getCollection')
-            ->with($this->getBlockMock())
+            ->with($this->blockCollectionMock)
             ->willReturn($collection);
 
         $this->messageManagerMock->expects($this->once())
@@ -78,7 +85,7 @@ public function testMassDeleteAction()
     protected function getBlockMock()
     {
         $blockMock = $this->getMock('Magento\Cms\Model\Resource\Block\Collection', ['delete'], [], '', false);
-        $blockMock->expects($this->any())->method('delete')->willReturn(true);
+        $blockMock->expects($this->once())->method('delete')->willReturn(true);
 
         return $blockMock;
     }
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
index f768a6480e6c8..923d4dcfc1a33 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
@@ -19,6 +19,11 @@ class MassDeleteTest extends AbstractMassDeleteTest
      */
     protected $collectionFactoryMock;
 
+    /**
+     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $pageCollectionMock;
+
     protected function setUp()
     {
         parent::setUp();
@@ -31,6 +36,8 @@ protected function setUp()
             false
         );
 
+        $this->pageCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', [], [], '', false);
+
         $this->massDeleteController = $this->objectManager->getObject(
             'Magento\Cms\Controller\Adminhtml\Page\MassDelete',
             [
@@ -50,11 +57,11 @@ public function testMassDeleteAction()
             $this->getPageMock()
         ];
 
-        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->getPageMock());
+        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->pageCollectionMock);
 
         $this->filterMock->expects($this->once())
             ->method('getCollection')
-            ->with($this->getPageMock())
+            ->with($this->pageCollectionMock)
             ->willReturn($collection);
 
         $this->messageManagerMock->expects($this->once())
@@ -78,7 +85,7 @@ public function testMassDeleteAction()
     protected function getPageMock()
     {
         $pageMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', ['delete'], [], '', false);
-        $pageMock->expects($this->any())->method('delete')->willReturn(true);
+        $pageMock->expects($this->once())->method('delete')->willReturn(true);
 
         return $pageMock;
     }

From a34f8e3cf282659dadd8cc8baa8093468e2f6f2d Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Wed, 26 Aug 2015 12:19:07 +0300
Subject: [PATCH 05/21] MAGETWO-41501: Wrong success mass delete message on cms
 pages and blocks

- Updated logic for deleted pages and blocks count;
- Unit tests updated;
---
 .../Cms/Controller/Adminhtml/Block/MassDelete.php     |  6 +++---
 .../Cms/Controller/Adminhtml/Page/MassDelete.php      |  6 +++---
 .../Controller/Adminhtml/Block/MassDeleteTest.php     | 11 ++++++++---
 .../Unit/Controller/Adminhtml/Page/MassDeleteTest.php | 11 ++++++++---
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
index 42319679b922c..6004e737bb04b 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
@@ -47,13 +47,13 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
     public function execute()
     {
         $collection = $this->filter->getCollection($this->collectionFactory->create());
-        $deletedBlocks = 0;
+        $collectionSize = $collection->getSize();
+
         foreach ($collection as $block) {
             $block->delete();
-            $deletedBlocks++;
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $deletedBlocks));
+        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collectionSize));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
index e699a3a480e5f..6505b7e6b7d8d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
@@ -46,13 +46,13 @@ public function __construct(Context $context, Filter $filter, CollectionFactory
     public function execute()
     {
         $collection = $this->filter->getCollection($this->collectionFactory->create());
-        $deletedPages = 0;
+        $collectionSize = $collection->getSize();
+
         foreach ($collection as $page) {
             $page->delete();
-            $deletedPages++;
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $deletedPages));
+        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collectionSize));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
index 467295679e923..f19d0c23d1d3d 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
@@ -50,7 +50,7 @@ protected function setUp()
 
     public function testMassDeleteAction()
     {
-        $deletedBlocks = 2;
+        $deletedBlocksCount = 2;
 
         $collection = [
             $this->getBlockMock(),
@@ -62,11 +62,16 @@ public function testMassDeleteAction()
         $this->filterMock->expects($this->once())
             ->method('getCollection')
             ->with($this->blockCollectionMock)
-            ->willReturn($collection);
+            ->willReturn($this->blockCollectionMock);
+
+        $this->blockCollectionMock->expects($this->once())->method('getSize')->willReturn($deletedBlocksCount);
+        $this->blockCollectionMock->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator($collection));
 
         $this->messageManagerMock->expects($this->once())
             ->method('addSuccess')
-            ->with(__('A total of %1 record(s) have been deleted.', $deletedBlocks));
+            ->with(__('A total of %1 record(s) have been deleted.', $deletedBlocksCount));
         $this->messageManagerMock->expects($this->never())->method('addError');
 
         $this->resultRedirectMock->expects($this->once())
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
index 923d4dcfc1a33..e728187acbc2c 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
@@ -50,7 +50,7 @@ protected function setUp()
 
     public function testMassDeleteAction()
     {
-        $deletedPages = 2;
+        $deletedPagesCount = 2;
 
         $collection = [
             $this->getPageMock(),
@@ -62,11 +62,16 @@ public function testMassDeleteAction()
         $this->filterMock->expects($this->once())
             ->method('getCollection')
             ->with($this->pageCollectionMock)
-            ->willReturn($collection);
+            ->willReturn($this->pageCollectionMock);
+
+        $this->pageCollectionMock->expects($this->once())->method('getSize')->willReturn($deletedPagesCount);
+        $this->pageCollectionMock->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator($collection));
 
         $this->messageManagerMock->expects($this->once())
             ->method('addSuccess')
-            ->with(__('A total of %1 record(s) have been deleted.', $deletedPages));
+            ->with(__('A total of %1 record(s) have been deleted.', $deletedPagesCount));
         $this->messageManagerMock->expects($this->never())->method('addError');
 
         $this->resultRedirectMock->expects($this->once())

From 3effacef3d487acc2a96e13f0b6e6fd5dae412f8 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Fri, 28 Aug 2015 16:50:25 +0300
Subject: [PATCH 06/21] MAGETWO-41501: Wrong success mass delete message on cms
 pages and blocks

- Changed success message for mass enable and mass disable actions;
- Unit tests added;
---
 .../Controller/Adminhtml/Page/MassDisable.php |   2 +-
 .../Controller/Adminhtml/Page/MassEnable.php  |   2 +-
 ...eteTest.php => AbstractMassActionTest.php} |   2 +-
 .../Adminhtml/Block/MassDeleteTest.php        |   4 +-
 .../Adminhtml/Page/MassDeleteTest.php         |   4 +-
 .../Adminhtml/Page/MassDisableTest.php        | 103 ++++++++++++++++++
 .../Adminhtml/Page/MassEnableTest.php         | 103 ++++++++++++++++++
 7 files changed, 213 insertions(+), 7 deletions(-)
 rename app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/{AbstractMassDeleteTest.php => AbstractMassActionTest.php} (97%)
 create mode 100644 app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
 create mode 100644 app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
index a3c5b07513f1e..e3d39c9a6f2ac 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
@@ -52,7 +52,7 @@ public function execute()
             $item->save();
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collection->getSize()));
+        $this->messageManager->addSuccess(__('A total of %1 record(s) have been disabled.', $collection->getSize()));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
index fff1f58a5b1c0..a6c7415d9d5f1 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
@@ -52,7 +52,7 @@ public function execute()
             $item->save();
         }
 
-        $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collection->getSize()));
+        $this->messageManager->addSuccess(__('A total of %1 record(s) have been enabled.', $collection->getSize()));
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassActionTest.php
similarity index 97%
rename from app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassDeleteTest.php
rename to app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassActionTest.php
index 0668edee3be7a..83802f3515b4d 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassActionTest.php
@@ -7,7 +7,7 @@
 
 use Magento\Framework\Controller\ResultFactory;
 
-abstract class AbstractMassDeleteTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractMassActionTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
index f19d0c23d1d3d..2910d63641d65 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Cms\Test\Unit\Controller\Adminhtml\Block;
 
-use Magento\Cms\Test\Unit\Controller\Adminhtml\AbstractMassDeleteTest;
+use Magento\Cms\Test\Unit\Controller\Adminhtml\AbstractMassActionTest;
 
-class MassDeleteTest extends AbstractMassDeleteTest
+class MassDeleteTest extends AbstractMassActionTest
 {
     /**
      * @var \Magento\Cms\Controller\Adminhtml\Block\MassDelete
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
index e728187acbc2c..6f87c8bca31c9 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Cms\Test\Unit\Controller\Adminhtml\Page;
 
-use Magento\Cms\Test\Unit\Controller\Adminhtml\AbstractMassDeleteTest;
+use Magento\Cms\Test\Unit\Controller\Adminhtml\AbstractMassActionTest;
 
-class MassDeleteTest extends AbstractMassDeleteTest
+class MassDeleteTest extends AbstractMassActionTest
 {
     /**
      * @var \Magento\Cms\Controller\Adminhtml\Page\MassDelete
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
new file mode 100644
index 0000000000000..1eddcf295be86
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Cms\Test\Unit\Controller\Adminhtml\Page;
+
+use Magento\Cms\Test\Unit\Controller\Adminhtml\AbstractMassActionTest;
+
+class MassDisableTest extends AbstractMassActionTest
+{
+    /**
+     * @var \Magento\Cms\Controller\Adminhtml\Page\MassDisable
+     */
+    protected $massDisableController;
+
+    /**
+     * @var \Magento\Cms\Model\Resource\Page\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $collectionFactoryMock;
+
+    /**
+     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $pageCollectionMock;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->collectionFactoryMock = $this->getMock(
+            'Magento\Cms\Model\Resource\Page\CollectionFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
+
+        $this->pageCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', [], [], '', false);
+
+        $this->massDisableController = $this->objectManager->getObject(
+            'Magento\Cms\Controller\Adminhtml\Page\MassDisable',
+            [
+                'context' => $this->contextMock,
+                'filter' => $this->filterMock,
+                'collectionFactory' => $this->collectionFactoryMock
+            ]
+        );
+    }
+
+    public function testMassDisableAction()
+    {
+        $disabledPagesCount = 2;
+
+        $collection = [
+            $this->getPageMock(),
+            $this->getPageMock()
+        ];
+
+        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->pageCollectionMock);
+
+        $this->filterMock->expects($this->once())
+            ->method('getCollection')
+            ->with($this->pageCollectionMock)
+            ->willReturn($this->pageCollectionMock);
+
+        $this->pageCollectionMock->expects($this->once())->method('getSize')->willReturn($disabledPagesCount);
+        $this->pageCollectionMock->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator($collection));
+
+        $this->messageManagerMock->expects($this->once())
+            ->method('addSuccess')
+            ->with(__('A total of %1 record(s) have been disabled.', $disabledPagesCount));
+        $this->messageManagerMock->expects($this->never())->method('addError');
+
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with('*/*/')
+            ->willReturnSelf();
+
+        $this->assertSame($this->resultRedirectMock, $this->massDisableController->execute());
+    }
+
+    /**
+     * Create Cms Page Collection Mock
+     *
+     * @return \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getPageMock()
+    {
+        $pageMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection',
+            ['setIsActive', 'save'],
+            [],
+            '',
+            false
+        );
+        $pageMock->expects($this->once())->method('setIsActive')->with(false)->willReturn(true);
+        $pageMock->expects($this->once())->method('save')->willReturn(true);
+
+        return $pageMock;
+    }
+}
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
new file mode 100644
index 0000000000000..d40a15e40691f
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Cms\Test\Unit\Controller\Adminhtml\Page;
+
+use Magento\Cms\Test\Unit\Controller\Adminhtml\AbstractMassActionTest;
+
+class MassEnableTest extends AbstractMassActionTest
+{
+    /**
+     * @var \Magento\Cms\Controller\Adminhtml\Page\MassEnable
+     */
+    protected $massEnableController;
+
+    /**
+     * @var \Magento\Cms\Model\Resource\Page\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $collectionFactoryMock;
+
+    /**
+     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $pageCollectionMock;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->collectionFactoryMock = $this->getMock(
+            'Magento\Cms\Model\Resource\Page\CollectionFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
+
+        $this->pageCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', [], [], '', false);
+
+        $this->massEnableController = $this->objectManager->getObject(
+            'Magento\Cms\Controller\Adminhtml\Page\MassEnable',
+            [
+                'context' => $this->contextMock,
+                'filter' => $this->filterMock,
+                'collectionFactory' => $this->collectionFactoryMock
+            ]
+        );
+    }
+
+    public function testMassEnableAction()
+    {
+        $enabledPagesCount = 2;
+
+        $collection = [
+            $this->getPageMock(),
+            $this->getPageMock()
+        ];
+
+        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->pageCollectionMock);
+
+        $this->filterMock->expects($this->once())
+            ->method('getCollection')
+            ->with($this->pageCollectionMock)
+            ->willReturn($this->pageCollectionMock);
+
+        $this->pageCollectionMock->expects($this->once())->method('getSize')->willReturn($enabledPagesCount);
+        $this->pageCollectionMock->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator($collection));
+
+        $this->messageManagerMock->expects($this->once())
+            ->method('addSuccess')
+            ->with(__('A total of %1 record(s) have been enabled.', $enabledPagesCount));
+        $this->messageManagerMock->expects($this->never())->method('addError');
+
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with('*/*/')
+            ->willReturnSelf();
+
+        $this->assertSame($this->resultRedirectMock, $this->massEnableController->execute());
+    }
+
+    /**
+     * Create Cms Page Collection Mock
+     *
+     * @return \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getPageMock()
+    {
+        $pageMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection',
+            ['setIsActive', 'save'],
+            [],
+            '',
+            false
+        );
+        $pageMock->expects($this->once())->method('setIsActive')->with(true)->willReturn(true);
+        $pageMock->expects($this->once())->method('save')->willReturn(true);
+
+        return $pageMock;
+    }
+}

From 3931d6c02c733278d0dd2f9f93bad60479c160f0 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Fri, 28 Aug 2015 16:58:20 +0300
Subject: [PATCH 07/21] MAGETWO-41501: Wrong success mass delete message on cms
 pages and blocks

- Code style updated;
---
 .../Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php    | 3 ++-
 .../Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
index 1eddcf295be86..7bc2ee03ecf6e 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
@@ -89,7 +89,8 @@ public function testMassDisableAction()
      */
     protected function getPageMock()
     {
-        $pageMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection',
+        $pageMock = $this->getMock(
+            'Magento\Cms\Model\Resource\Page\Collection',
             ['setIsActive', 'save'],
             [],
             '',
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
index d40a15e40691f..2fbef8db33457 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
@@ -89,7 +89,8 @@ public function testMassEnableAction()
      */
     protected function getPageMock()
     {
-        $pageMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection',
+        $pageMock = $this->getMock(
+            'Magento\Cms\Model\Resource\Page\Collection',
             ['setIsActive', 'save'],
             [],
             '',

From 8aac4c7ad5447197e9d2a0e13025bd4f1a9897ab Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@ebay.com>
Date: Fri, 28 Aug 2015 18:34:28 +0300
Subject: [PATCH 08/21] MAGETWO-42092: CMS page preview not works when changing
 store view

---
 .../Magento/Backend/Block/Store/Switcher.php  | 19 ++++++++++++++
 .../adminhtml/templates/store/switcher.phtml  | 25 ++++++++++++++++---
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
index a224e2a3b40d9..80617c52ac3eb 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher.php
@@ -87,6 +87,11 @@ class Switcher extends \Magento\Backend\Block\Template
      */
     protected $_storeFactory;
 
+    /**
+     * @var bool
+     */
+    protected $isUsingIframe = false;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Store\Model\WebsiteFactory $websiteFactory
@@ -558,4 +563,18 @@ public function getHintHtml()
         }
         return $html;
     }
+
+    /**
+     * @param $state
+     */
+    public function setUseIframe($state = false) {
+        $this->isUsingIframe = (bool) $state;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isUsingIframe() {
+        return $this->isUsingIframe;
+    }
 }
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
index a2f94b3563cfc..f1e457f03673d 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
@@ -30,7 +30,8 @@
             class="admin__action-dropdown"
             data-mage-init='{"dropdown":{}}'
             data-toggle="dropdown"
-            aria-haspopup="true">
+            aria-haspopup="true"
+            id="store-change-button">
             <?php echo $block->getCurrentSelectionName() ?>
         </button>
         <ul class="dropdown-menu" data-role="stores-list">
@@ -168,15 +169,33 @@ require(['jquery'], function(jQuery){
             };
             scopeSwitcherHandler(switcherParams);
         } else {
-            var url = '<?php echo $block->getSwitchUrl() ?>' + scopeParams;
+
             <?php if ($block->getUseConfirm()): ?>
             if (confirm("<?php echo __('Please confirm scope switching. All data that hasn\'t been saved will be lost.') ?>")) {
-                setLocation(url);
+                reload();
             } else {
                 obj.value = '<?php echo $block->getStoreId() ?>';
             }
             <?php else: ?>
+                reload();
+            <?php endif; ?>
+        }
+
+        function reload() {
+            <?php if (!$block->isUsingIframe()): ?>
+            var url = '<?php echo $block->getSwitchUrl() ?>' + scopeParams;
             setLocation(url);
+            <?php else: ?>
+            jQuery('#preview_selected_store').val(scopeId);
+            jQuery('#preview_form').submit();
+
+            jQuery('.store-switcher .dropdown-menu li a').each(function() {
+                var $this = jQuery(this);
+
+                if ($this.data('role') === 'store-view-id' && $this.data('value') == scopeId) {
+                    jQuery('#store-change-button').html($this.text());
+                }
+            });
             <?php endif; ?>
         }
     }

From ecc9d583a82f5c00096736786035a98836c6474d Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@ebay.com>
Date: Fri, 28 Aug 2015 19:08:10 +0300
Subject: [PATCH 09/21] MAGETWO-42092: CMS page preview not works when changing
 store view

---
 app/code/Magento/Backend/Block/Store/Switcher.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
index 80617c52ac3eb..965d61cd1e3aa 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher.php
@@ -565,16 +565,20 @@ public function getHintHtml()
     }
 
     /**
-     * @param $state
+     * @param bool $state
+     * @return $this
      */
-    public function setUseIframe($state = false) {
+    public function setUseIframe($state = false)
+    {
         $this->isUsingIframe = (bool) $state;
+        return $this;
     }
 
     /**
      * @return bool
      */
-    public function isUsingIframe() {
+    public function isUsingIframe()
+    {
         return $this->isUsingIframe;
     }
 }

From 5dfe14167359240e9f91de9db28586b267d5a2bc Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@ebay.com>
Date: Mon, 31 Aug 2015 10:29:33 +0300
Subject: [PATCH 10/21] MAGETWO-42092: CMS page preview not works when changing
 store view

---
 .../Magento/Backend/Block/Store/Switcher.php  | 20 ++++---------------
 .../adminhtml/templates/store/switcher.phtml  |  2 ++
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
index 965d61cd1e3aa..cd74d82aa4646 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher.php
@@ -87,11 +87,6 @@ class Switcher extends \Magento\Backend\Block\Template
      */
     protected $_storeFactory;
 
-    /**
-     * @var bool
-     */
-    protected $isUsingIframe = false;
-
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Store\Model\WebsiteFactory $websiteFactory
@@ -564,21 +559,14 @@ public function getHintHtml()
         return $html;
     }
 
-    /**
-     * @param bool $state
-     * @return $this
-     */
-    public function setUseIframe($state = false)
-    {
-        $this->isUsingIframe = (bool) $state;
-        return $this;
-    }
-
     /**
      * @return bool
      */
     public function isUsingIframe()
     {
-        return $this->isUsingIframe;
+        if ($this->hasData('is_using_iframe')) {
+            return (bool) $this->getData('is_using_iframe');
+        }
+        return false;
     }
 }
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
index f1e457f03673d..ef97688024295 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
@@ -196,6 +196,8 @@ require(['jquery'], function(jQuery){
                     jQuery('#store-change-button').html($this.text());
                 }
             });
+
+            jQuery('#store-change-button').click();
             <?php endif; ?>
         }
     }

From 6de342568fb0780feb999109967dabc34ba6c9c5 Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@ebay.com>
Date: Mon, 31 Aug 2015 11:28:55 +0300
Subject: [PATCH 11/21] MAGETWO-42092: CMS page preview not works when changing
 store view

---
 app/code/Magento/Backend/Block/Store/Switcher.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
index cd74d82aa4646..106a1fd4f1d4a 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher.php
@@ -560,12 +560,14 @@ public function getHintHtml()
     }
 
     /**
+     * Return iframe usage status
+     *
      * @return bool
      */
     public function isUsingIframe()
     {
         if ($this->hasData('is_using_iframe')) {
-            return (bool) $this->getData('is_using_iframe');
+            return (bool)$this->getData('is_using_iframe');
         }
         return false;
     }

From 41edbb02cf11e03ef0a9623f84f9089d4737ca1a Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@ebay.com>
Date: Mon, 31 Aug 2015 13:16:57 +0300
Subject: [PATCH 12/21] MAGETWO-42092: CMS page preview not works when changing
 store view

---
 app/code/Magento/Backend/Block/Store/Switcher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
index 106a1fd4f1d4a..8cf98be294f97 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher.php
@@ -560,7 +560,7 @@ public function getHintHtml()
     }
 
     /**
-     * Return iframe usage status
+     * Get whether iframe is being used
      *
      * @return bool
      */

From bc4d9ec6227ecdc60f75b6993db6ef00031e5b58 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <bkorablov@ebay.com>
Date: Mon, 31 Aug 2015 17:46:17 +0300
Subject: [PATCH 13/21] MAGETWO-42096: The widgets are not rendered on the cms
 preview page

---
 .../Magento/Widget/Model/Template/Filter.php  |  15 +-
 .../Widget/Model/Template/FilterEmulate.php   |  20 ++
 .../Unit/Model/Template/FilterEmulateTest.php |  59 ++++
 .../Test/Unit/Model/Template/FilterTest.php   | 265 +++++++++++++++++-
 app/code/Magento/Widget/etc/adminhtml/di.xml  |   6 +
 5 files changed, 349 insertions(+), 16 deletions(-)
 create mode 100644 app/code/Magento/Widget/Model/Template/FilterEmulate.php
 create mode 100644 app/code/Magento/Widget/Test/Unit/Model/Template/FilterEmulateTest.php

diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index a07bdd85de474..d2a9f11772deb 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -73,12 +73,12 @@ public function __construct(
     }
 
     /**
-     * Generate widget
+     * General method for generate widget
      *
      * @param string[] $construction
      * @return string
      */
-    public function widgetDirective($construction)
+    public function generateWidget($construction)
     {
         $params = $this->getParameters($construction[2]);
 
@@ -114,6 +114,17 @@ public function widgetDirective($construction)
         return $widget->toHtml();
     }
 
+    /**
+     * Generate widget
+     *
+     * @param string[] $construction
+     * @return string
+     */
+    public function widgetDirective($construction)
+    {
+        return $this->generateWidget($construction);
+    }
+
     /**
      * Retrieve media file URL directive
      *
diff --git a/app/code/Magento/Widget/Model/Template/FilterEmulate.php b/app/code/Magento/Widget/Model/Template/FilterEmulate.php
new file mode 100644
index 0000000000000..9c7aefc55afe2
--- /dev/null
+++ b/app/code/Magento/Widget/Model/Template/FilterEmulate.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Widget\Model\Template;
+
+class FilterEmulate extends Filter
+{
+    /**
+     * Generate widget with emulation frontend area
+     *
+     * @param string[] $construction
+     * @return string
+     */
+    public function widgetDirective($construction)
+    {
+        return $this->_appState->emulateAreaCode('frontend', [$this, 'generateWidget'], [$construction]);
+    }
+}
diff --git a/app/code/Magento/Widget/Test/Unit/Model/Template/FilterEmulateTest.php b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterEmulateTest.php
new file mode 100644
index 0000000000000..7a9115f5c4ca1
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterEmulateTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Widget\Test\Unit\Model\Template;
+
+use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class FilterEmulateTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManagerHelper;
+
+    /**
+     * @var \Magento\Widget\Model\Template\FilterEmulate
+     */
+    protected $filterEmulate;
+
+    /**
+     * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $appStateMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->appStateMock = $this->getMock('Magento\Framework\App\State', [], [], '', false);
+
+        $this->filterEmulate = $this->objectManagerHelper->getObject(
+            'Magento\Widget\Model\Template\FilterEmulate',
+            ['appState' => $this->appStateMock]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testWidgetDirective()
+    {
+        $result = 'some text';
+        $construction = [
+            '{{widget type="Widget\\Link" anchor_text="Test" template="block.phtml" id_path="p/1"}}',
+            'widget',
+            ' type="" anchor_text="Test" template="block.phtml" id_path="p/1"'
+        ];
+
+        $this->appStateMock->expects($this->once())
+            ->method('emulateAreaCode')
+            ->with('frontend', [$this->filterEmulate, 'generateWidget'], [$construction])
+            ->willReturn($result);
+        $this->assertSame($result, $this->filterEmulate->widgetDirective($construction));
+    }
+}
diff --git a/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php
index 82c845cfe85b2..3398f84b604a5 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php
@@ -5,32 +5,269 @@
  */
 namespace Magento\Widget\Test\Unit\Model\Template;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Store\Model\StoreManagerInterface;
 
 class FilterTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var \Magento\Widget\Model\Template\Filter
+     */
+    protected $filter;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManagerHelper;
+
+    /**
+     * @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeMock;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeManagerMock;
+
+    /**
+     * @var \Magento\Widget\Model\Resource\Widget|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $widgetResourceMock;
+
+    /**
+     * @var \Magento\Widget\Model\Widget|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $widgetMock;
+
+    /**
+     * @var \Magento\Framework\View\LayoutInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $layoutMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+        $this->widgetResourceMock = $this->getMock('Magento\Widget\Model\Resource\Widget', [], [], '', false);
+        $this->widgetMock = $this->getMock('Magento\Widget\Model\Widget', [], [], '', false);
+        $this->layoutMock = $this->getMock('Magento\Framework\View\LayoutInterface', [], [], '', false);
+
+        $this->filter = $this->objectManagerHelper->getObject(
+            'Magento\Widget\Model\Template\Filter',
+            [
+                'storeManager' => $this->storeManagerMock,
+                'widgetResource' => $this->widgetResourceMock,
+                'widget' => $this->widgetMock,
+                'layout' => $this->layoutMock
+            ]
+        );
+    }
+
+    /**
+     * @param array $construction
+     * @param string $name
+     * @param string $type
+     * @param int $preConfigId
+     * @param array $params
+     * @param array $preconfigure
+     * @param string $widgetXml
+     * @param \Magento\Widget\Block\BlockInterface|null $widgetBlock
+     * @param string $expectedResult
+     * @return void
+     * @dataProvider generateWidgetDataProvider
+     */
+    public function testGenerateWidget(
+        $construction,
+        $name,
+        $type,
+        $preConfigId,
+        $params,
+        $preconfigure,
+        $widgetXml,
+        $widgetBlock,
+        $expectedResult
+    ) {
+        $this->generalForGenerateWidget($name, $type, $preConfigId, $params, $preconfigure, $widgetXml, $widgetBlock);
+        $this->assertSame($expectedResult, $this->filter->generateWidget($construction));
+    }
+
+    /**
+     * @param array $construction
+     * @param string $name
+     * @param string $type
+     * @param int $preConfigId
+     * @param array $params
+     * @param array $preconfigure
+     * @param string $widgetXml
+     * @param \Magento\Widget\Block\BlockInterface|null $widgetBlock
+     * @param string $expectedResult
+     * @return void
+     * @dataProvider generateWidgetDataProvider
+     */
+    public function testWidgetDirective(
+        $construction,
+        $name,
+        $type,
+        $preConfigId,
+        $params,
+        $preconfigure,
+        $widgetXml,
+        $widgetBlock,
+        $expectedResult
+    ) {
+        $this->generalForGenerateWidget($name, $type, $preConfigId, $params, $preconfigure, $widgetXml, $widgetBlock);
+        $this->assertSame($expectedResult, $this->filter->widgetDirective($construction));
+    }
+
+    /**
+     * @return array
+     */
+    public function generateWidgetDataProvider()
+    {
+        return [
+            [
+                'construction' => [
+                    '{{widget type="Widget\\Link" anchor_text="Test" template="block.phtml" id_path="p/1"}}',
+                    'widget',
+                    ' type="" anchor_text="Test" template="block.phtml" id_path="p/1"'
+                ],
+                'name' => null,
+                'type' => 'Widget\Link',
+                'preConfigId' => null,
+                'params' => ['id' => ''],
+                'preconfigure' => [],
+                'widgetXml' => '',
+                'widgetBlock' => null,
+                'expectedResult' => ''
+            ],
+            [
+                'construction' => [
+                    '{{widget type="Widget\\Link" anchor_text="Test" template="block.phtml" id_path="p/1"}}',
+                    'widget',
+                    ' type="" id="1" anchor_text="Test" template="block.phtml" id_path="p/1"'
+                ],
+                'name' => null,
+                'type' => null,
+                'preConfigId' => 1,
+                'params' => ['id' => '1'],
+                'preconfigure' => ['widget_type' => '', 'parameters' => ''],
+                'widgetXml' => null,
+                'widgetBlock' => null,
+                'expectedResult' => ''
+            ],
+            [
+                'construction' => [
+                    '{{widget type="Widget\\Link" anchor_text="Test" template="block.phtml" id_path="p/1"}}',
+                    'widget',
+                    ' type="" name="testName" id="1" anchor_text="Test" template="block.phtml" id_path="p/1"'
+                ],
+                'name' => 'testName',
+                'type' => 'Widget\Link',
+                'preConfigId' => 1,
+                'params' => ['id' => '1'],
+                'preconfigure' => ['widget_type' => "Widget\\Link", 'parameters' => ['id' => '1']],
+                'widgetXml' => 'some xml',
+                'widgetBlock' => $this->getBlockMock('widget text'),
+                'expectedResult' => 'widget text'
+            ],
+            [
+                'construction' => [
+                    '{{widget type="Widget\\Link" anchor_text="Test" template="block.phtml" id_path="p/1"}}',
+                    'widget',
+                    ' type="Widget\\Link" name="testName" anchor_text="Test" template="block.phtml" id_path="p/1"'
+                ],
+                'name' => 'testName',
+                'type' => 'Widget\Link',
+                'preConfigId' => null,
+                'params' => [
+                    'type' => 'Widget\Link',
+                    'name' => 'testName',
+                    'anchor_text' => 'Test',
+                    'template' => 'block.phtml',
+                    'id_path' => 'p/1'
+                ],
+                'preconfigure' => [],
+                'widgetXml' => 'some xml',
+                'widgetBlock' => $this->getBlockMock('widget text'),
+                'expectedResult' => 'widget text'
+            ],
+        ];
+    }
+
+    /**
+     * @param string $name
+     * @param string $type
+     * @param int $preConfigId
+     * @param array $params
+     * @param array $preconfigure
+     * @param string $widgetXml
+     * @param \Magento\Widget\Block\BlockInterface|null $widgetBlock
+     * @return void
+     * @dataProvider generateWidgetDataProvider
+     */
+    protected function generalForGenerateWidget(
+        $name,
+        $type,
+        $preConfigId,
+        $params,
+        $preconfigure,
+        $widgetXml,
+        $widgetBlock
+    ) {
+        $this->widgetResourceMock->expects($this->any())
+            ->method('loadPreconfiguredWidget')
+            ->with($preConfigId)
+            ->willReturn($preconfigure);
+        $this->widgetMock->expects($this->any())
+            ->method('getWidgetByClassType')
+            ->with($type)
+            ->willReturn($widgetXml);
+        $this->layoutMock->expects($this->any())
+            ->method('createBlock')
+            ->with($type, $name, ['data' => $params])
+            ->willReturn($widgetBlock);
+    }
+
+    /**
+     * @param string $returnedResult
+     * @return \Magento\Widget\Block\BlockInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getBlockMock($returnedResult = '')
+    {
+        /** @var \Magento\Widget\Block\BlockInterface|\PHPUnit_Framework_MockObject_MockObject $blockMock */
+        $blockMock = $this->getMockBuilder('Magento\Widget\Block\BlockInterface')
+            ->setMethods(['toHtml'])
+            ->getMockForAbstractClass();
+        $blockMock->expects($this->any())
+            ->method('toHtml')
+            ->willReturn($returnedResult);
+
+        return $blockMock;
+    }
+
+    /**
+     * @return void
+     */
     public function testMediaDirective()
     {
         $image = 'wysiwyg/VB.png';
         $construction = ['{{media url="' . $image . '"}}', 'media', ' url="' . $image . '"'];
         $baseUrl = 'http://localhost/pub/media/';
 
-        /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject $storeMock */
-        $storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
-        $storeMock->expects($this->once())->method('getBaseUrl')->with(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA)
+        $this->storeMock->expects($this->once())
+            ->method('getBaseUrl')
+            ->with(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA)
             ->willReturn($baseUrl);
+        $this->storeManagerMock->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
 
-        /** @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject $storeManagerMock */
-        $storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
-        $storeManagerMock->expects($this->once())->method('getStore')->will($this->returnValue($storeMock));
-
-        /** @var \Magento\Widget\Model\Template\Filter $filter */
-        $filter = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
-            ->getObject(
-                'Magento\Widget\Model\Template\Filter',
-                ['storeManager' => $storeManagerMock]
-            );
-        $result = $filter->mediaDirective($construction);
+        $result = $this->filter->mediaDirective($construction);
         $this->assertEquals($baseUrl . $image, $result);
     }
 }
diff --git a/app/code/Magento/Widget/etc/adminhtml/di.xml b/app/code/Magento/Widget/etc/adminhtml/di.xml
index 723a652e4548b..52d47c1c9391e 100644
--- a/app/code/Magento/Widget/etc/adminhtml/di.xml
+++ b/app/code/Magento/Widget/etc/adminhtml/di.xml
@@ -14,4 +14,10 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Cms\Model\Template\FilterProvider">
+        <arguments>
+            <argument name="pageFilter" xsi:type="string">Magento\Widget\Model\Template\FilterEmulate</argument>
+            <argument name="blockFilter" xsi:type="string">Magento\Widget\Model\Template\FilterEmulate</argument>
+        </arguments>
+    </type>
 </config>

From 9c8aa9fd175c383c2bfe3f593c125871553c3b97 Mon Sep 17 00:00:00 2001
From: Bohdan Korablov <bkorablov@ebay.com>
Date: Mon, 31 Aug 2015 18:57:33 +0300
Subject: [PATCH 14/21] MAGETWO-42096: The widgets are not rendered on the cms
 preview page

---
 .../Magento/Widget/Test/Unit/Model/Template/FilterTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php
index 3398f84b604a5..77921c4b21964 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php
@@ -52,10 +52,10 @@ protected function setUp()
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
-        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->widgetResourceMock = $this->getMock('Magento\Widget\Model\Resource\Widget', [], [], '', false);
         $this->widgetMock = $this->getMock('Magento\Widget\Model\Widget', [], [], '', false);
-        $this->layoutMock = $this->getMock('Magento\Framework\View\LayoutInterface', [], [], '', false);
+        $this->layoutMock = $this->getMock('Magento\Framework\View\LayoutInterface');
 
         $this->filter = $this->objectManagerHelper->getObject(
             'Magento\Widget\Model\Template\Filter',

From 16dc1f999ad3cdd4d4276fb26c8d1bd991c4ae80 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Mon, 31 Aug 2015 19:27:18 +0300
Subject: [PATCH 15/21] MAGETWO-41501: Wrong success mass delete message on cms
 pages and blocks

- Abstract unit test class updated;
---
 .../Adminhtml/AbstractMassActionTest.php      | 44 +++++++++++++++++++
 .../Adminhtml/Page/MassDeleteTest.php         | 35 ++-------------
 .../Adminhtml/Page/MassDisableTest.php        | 35 ++-------------
 .../Adminhtml/Page/MassEnableTest.php         | 35 ++-------------
 4 files changed, 53 insertions(+), 96 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassActionTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassActionTest.php
index 83802f3515b4d..db1bd0b305336 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassActionTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassActionTest.php
@@ -39,6 +39,11 @@ abstract class AbstractMassActionTest extends \PHPUnit_Framework_TestCase
      */
     protected $filterMock;
 
+    /**
+     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $pageCollectionMock;
+
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -56,6 +61,8 @@ protected function setUp()
             ->with(ResultFactory::TYPE_REDIRECT, [])
             ->willReturn($this->resultRedirectMock);
 
+        $this->pageCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', [], [], '', false);
+
         $this->contextMock = $this->getMock('\Magento\Backend\App\Action\Context', [], [], '', false);
 
         $this->filterMock = $this->getMockBuilder('Magento\Ui\Component\MassAction\Filter')
@@ -65,4 +72,41 @@ protected function setUp()
         $this->contextMock->expects($this->any())->method('getMessageManager')->willReturn($this->messageManagerMock);
         $this->contextMock->expects($this->any())->method('getResultFactory')->willReturn($this->resultFactoryMock);
     }
+
+    /**
+     * @param string $message
+     * @param int $size
+     */
+    protected function processMassAction($message, $size)
+    {
+        $collection = [
+            $this->getPageMock(),
+            $this->getPageMock()
+        ];
+
+        $this->filterMock->expects($this->once())
+            ->method('getCollection')
+            ->with($this->pageCollectionMock)
+            ->willReturn($this->pageCollectionMock);
+
+        $this->pageCollectionMock->expects($this->once())->method('getSize')->willReturn($size);
+        $this->pageCollectionMock->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator($collection));
+
+        $this->messageManagerMock->expects($this->once())
+            ->method('addSuccess')
+            ->with(__($message, $size));
+        $this->messageManagerMock->expects($this->never())->method('addError');
+
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with('*/*/')
+            ->willReturnSelf();
+    }
+
+    /**
+     * @return \Magento\Cms\Model\Resource\Page\Collection
+     */
+    abstract protected function getPageMock();
 }
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
index 6f87c8bca31c9..915fff29b5ca4 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
@@ -19,11 +19,6 @@ class MassDeleteTest extends AbstractMassActionTest
      */
     protected $collectionFactoryMock;
 
-    /**
-     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $pageCollectionMock;
-
     protected function setUp()
     {
         parent::setUp();
@@ -36,8 +31,6 @@ protected function setUp()
             false
         );
 
-        $this->pageCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', [], [], '', false);
-
         $this->massDeleteController = $this->objectManager->getObject(
             'Magento\Cms\Controller\Adminhtml\Page\MassDelete',
             [
@@ -50,34 +43,12 @@ protected function setUp()
 
     public function testMassDeleteAction()
     {
-        $deletedPagesCount = 2;
-
-        $collection = [
-            $this->getPageMock(),
-            $this->getPageMock()
-        ];
+        $size = 2;
+        $message = 'A total of %1 record(s) have been deleted.';
 
         $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->pageCollectionMock);
 
-        $this->filterMock->expects($this->once())
-            ->method('getCollection')
-            ->with($this->pageCollectionMock)
-            ->willReturn($this->pageCollectionMock);
-
-        $this->pageCollectionMock->expects($this->once())->method('getSize')->willReturn($deletedPagesCount);
-        $this->pageCollectionMock->expects($this->once())
-            ->method('getIterator')
-            ->willReturn(new \ArrayIterator($collection));
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
-            ->with(__('A total of %1 record(s) have been deleted.', $deletedPagesCount));
-        $this->messageManagerMock->expects($this->never())->method('addError');
-
-        $this->resultRedirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/')
-            ->willReturnSelf();
+        $this->processMassAction($message, $size);
 
         $this->assertSame($this->resultRedirectMock, $this->massDeleteController->execute());
     }
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
index 7bc2ee03ecf6e..c8fd29b239c29 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
@@ -19,11 +19,6 @@ class MassDisableTest extends AbstractMassActionTest
      */
     protected $collectionFactoryMock;
 
-    /**
-     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $pageCollectionMock;
-
     protected function setUp()
     {
         parent::setUp();
@@ -36,8 +31,6 @@ protected function setUp()
             false
         );
 
-        $this->pageCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', [], [], '', false);
-
         $this->massDisableController = $this->objectManager->getObject(
             'Magento\Cms\Controller\Adminhtml\Page\MassDisable',
             [
@@ -50,34 +43,12 @@ protected function setUp()
 
     public function testMassDisableAction()
     {
-        $disabledPagesCount = 2;
-
-        $collection = [
-            $this->getPageMock(),
-            $this->getPageMock()
-        ];
+        $size = 2;
+        $message = 'A total of %1 record(s) have been disabled.';
 
         $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->pageCollectionMock);
 
-        $this->filterMock->expects($this->once())
-            ->method('getCollection')
-            ->with($this->pageCollectionMock)
-            ->willReturn($this->pageCollectionMock);
-
-        $this->pageCollectionMock->expects($this->once())->method('getSize')->willReturn($disabledPagesCount);
-        $this->pageCollectionMock->expects($this->once())
-            ->method('getIterator')
-            ->willReturn(new \ArrayIterator($collection));
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
-            ->with(__('A total of %1 record(s) have been disabled.', $disabledPagesCount));
-        $this->messageManagerMock->expects($this->never())->method('addError');
-
-        $this->resultRedirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/')
-            ->willReturnSelf();
+        $this->processMassAction($message, $size);
 
         $this->assertSame($this->resultRedirectMock, $this->massDisableController->execute());
     }
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
index 2fbef8db33457..bdf289dcc33f3 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
@@ -19,11 +19,6 @@ class MassEnableTest extends AbstractMassActionTest
      */
     protected $collectionFactoryMock;
 
-    /**
-     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $pageCollectionMock;
-
     protected function setUp()
     {
         parent::setUp();
@@ -36,8 +31,6 @@ protected function setUp()
             false
         );
 
-        $this->pageCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', [], [], '', false);
-
         $this->massEnableController = $this->objectManager->getObject(
             'Magento\Cms\Controller\Adminhtml\Page\MassEnable',
             [
@@ -50,34 +43,12 @@ protected function setUp()
 
     public function testMassEnableAction()
     {
-        $enabledPagesCount = 2;
-
-        $collection = [
-            $this->getPageMock(),
-            $this->getPageMock()
-        ];
+        $size = 2;
+        $message = 'A total of %1 record(s) have been enabled.';
 
         $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->pageCollectionMock);
 
-        $this->filterMock->expects($this->once())
-            ->method('getCollection')
-            ->with($this->pageCollectionMock)
-            ->willReturn($this->pageCollectionMock);
-
-        $this->pageCollectionMock->expects($this->once())->method('getSize')->willReturn($enabledPagesCount);
-        $this->pageCollectionMock->expects($this->once())
-            ->method('getIterator')
-            ->willReturn(new \ArrayIterator($collection));
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
-            ->with(__('A total of %1 record(s) have been enabled.', $enabledPagesCount));
-        $this->messageManagerMock->expects($this->never())->method('addError');
-
-        $this->resultRedirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/')
-            ->willReturnSelf();
+        $this->processMassAction($message, $size);
 
         $this->assertSame($this->resultRedirectMock, $this->massEnableController->execute());
     }

From aeb0d090d9cc4ffddcbf02ee673c979a4d80c38e Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Mon, 31 Aug 2015 20:01:39 +0300
Subject: [PATCH 16/21] MAGETWO-41501: Wrong success mass delete message on cms
 pages and blocks

- Unit tests updated;
---
 .../Adminhtml/AbstractMassActionTest.php      | 44 -------------------
 .../Adminhtml/Page/MassDeleteTest.php         | 35 +++++++++++++--
 .../Adminhtml/Page/MassDisableTest.php        | 35 +++++++++++++--
 .../Adminhtml/Page/MassEnableTest.php         | 35 +++++++++++++--
 4 files changed, 96 insertions(+), 53 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassActionTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassActionTest.php
index db1bd0b305336..83802f3515b4d 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassActionTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassActionTest.php
@@ -39,11 +39,6 @@ abstract class AbstractMassActionTest extends \PHPUnit_Framework_TestCase
      */
     protected $filterMock;
 
-    /**
-     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $pageCollectionMock;
-
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -61,8 +56,6 @@ protected function setUp()
             ->with(ResultFactory::TYPE_REDIRECT, [])
             ->willReturn($this->resultRedirectMock);
 
-        $this->pageCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', [], [], '', false);
-
         $this->contextMock = $this->getMock('\Magento\Backend\App\Action\Context', [], [], '', false);
 
         $this->filterMock = $this->getMockBuilder('Magento\Ui\Component\MassAction\Filter')
@@ -72,41 +65,4 @@ protected function setUp()
         $this->contextMock->expects($this->any())->method('getMessageManager')->willReturn($this->messageManagerMock);
         $this->contextMock->expects($this->any())->method('getResultFactory')->willReturn($this->resultFactoryMock);
     }
-
-    /**
-     * @param string $message
-     * @param int $size
-     */
-    protected function processMassAction($message, $size)
-    {
-        $collection = [
-            $this->getPageMock(),
-            $this->getPageMock()
-        ];
-
-        $this->filterMock->expects($this->once())
-            ->method('getCollection')
-            ->with($this->pageCollectionMock)
-            ->willReturn($this->pageCollectionMock);
-
-        $this->pageCollectionMock->expects($this->once())->method('getSize')->willReturn($size);
-        $this->pageCollectionMock->expects($this->once())
-            ->method('getIterator')
-            ->willReturn(new \ArrayIterator($collection));
-
-        $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
-            ->with(__($message, $size));
-        $this->messageManagerMock->expects($this->never())->method('addError');
-
-        $this->resultRedirectMock->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/')
-            ->willReturnSelf();
-    }
-
-    /**
-     * @return \Magento\Cms\Model\Resource\Page\Collection
-     */
-    abstract protected function getPageMock();
 }
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
index 915fff29b5ca4..6f87c8bca31c9 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php
@@ -19,6 +19,11 @@ class MassDeleteTest extends AbstractMassActionTest
      */
     protected $collectionFactoryMock;
 
+    /**
+     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $pageCollectionMock;
+
     protected function setUp()
     {
         parent::setUp();
@@ -31,6 +36,8 @@ protected function setUp()
             false
         );
 
+        $this->pageCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', [], [], '', false);
+
         $this->massDeleteController = $this->objectManager->getObject(
             'Magento\Cms\Controller\Adminhtml\Page\MassDelete',
             [
@@ -43,12 +50,34 @@ protected function setUp()
 
     public function testMassDeleteAction()
     {
-        $size = 2;
-        $message = 'A total of %1 record(s) have been deleted.';
+        $deletedPagesCount = 2;
+
+        $collection = [
+            $this->getPageMock(),
+            $this->getPageMock()
+        ];
 
         $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->pageCollectionMock);
 
-        $this->processMassAction($message, $size);
+        $this->filterMock->expects($this->once())
+            ->method('getCollection')
+            ->with($this->pageCollectionMock)
+            ->willReturn($this->pageCollectionMock);
+
+        $this->pageCollectionMock->expects($this->once())->method('getSize')->willReturn($deletedPagesCount);
+        $this->pageCollectionMock->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator($collection));
+
+        $this->messageManagerMock->expects($this->once())
+            ->method('addSuccess')
+            ->with(__('A total of %1 record(s) have been deleted.', $deletedPagesCount));
+        $this->messageManagerMock->expects($this->never())->method('addError');
+
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with('*/*/')
+            ->willReturnSelf();
 
         $this->assertSame($this->resultRedirectMock, $this->massDeleteController->execute());
     }
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
index c8fd29b239c29..7bc2ee03ecf6e 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php
@@ -19,6 +19,11 @@ class MassDisableTest extends AbstractMassActionTest
      */
     protected $collectionFactoryMock;
 
+    /**
+     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $pageCollectionMock;
+
     protected function setUp()
     {
         parent::setUp();
@@ -31,6 +36,8 @@ protected function setUp()
             false
         );
 
+        $this->pageCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', [], [], '', false);
+
         $this->massDisableController = $this->objectManager->getObject(
             'Magento\Cms\Controller\Adminhtml\Page\MassDisable',
             [
@@ -43,12 +50,34 @@ protected function setUp()
 
     public function testMassDisableAction()
     {
-        $size = 2;
-        $message = 'A total of %1 record(s) have been disabled.';
+        $disabledPagesCount = 2;
+
+        $collection = [
+            $this->getPageMock(),
+            $this->getPageMock()
+        ];
 
         $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->pageCollectionMock);
 
-        $this->processMassAction($message, $size);
+        $this->filterMock->expects($this->once())
+            ->method('getCollection')
+            ->with($this->pageCollectionMock)
+            ->willReturn($this->pageCollectionMock);
+
+        $this->pageCollectionMock->expects($this->once())->method('getSize')->willReturn($disabledPagesCount);
+        $this->pageCollectionMock->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator($collection));
+
+        $this->messageManagerMock->expects($this->once())
+            ->method('addSuccess')
+            ->with(__('A total of %1 record(s) have been disabled.', $disabledPagesCount));
+        $this->messageManagerMock->expects($this->never())->method('addError');
+
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with('*/*/')
+            ->willReturnSelf();
 
         $this->assertSame($this->resultRedirectMock, $this->massDisableController->execute());
     }
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
index bdf289dcc33f3..2fbef8db33457 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php
@@ -19,6 +19,11 @@ class MassEnableTest extends AbstractMassActionTest
      */
     protected $collectionFactoryMock;
 
+    /**
+     * @var \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $pageCollectionMock;
+
     protected function setUp()
     {
         parent::setUp();
@@ -31,6 +36,8 @@ protected function setUp()
             false
         );
 
+        $this->pageCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', [], [], '', false);
+
         $this->massEnableController = $this->objectManager->getObject(
             'Magento\Cms\Controller\Adminhtml\Page\MassEnable',
             [
@@ -43,12 +50,34 @@ protected function setUp()
 
     public function testMassEnableAction()
     {
-        $size = 2;
-        $message = 'A total of %1 record(s) have been enabled.';
+        $enabledPagesCount = 2;
+
+        $collection = [
+            $this->getPageMock(),
+            $this->getPageMock()
+        ];
 
         $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->pageCollectionMock);
 
-        $this->processMassAction($message, $size);
+        $this->filterMock->expects($this->once())
+            ->method('getCollection')
+            ->with($this->pageCollectionMock)
+            ->willReturn($this->pageCollectionMock);
+
+        $this->pageCollectionMock->expects($this->once())->method('getSize')->willReturn($enabledPagesCount);
+        $this->pageCollectionMock->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator($collection));
+
+        $this->messageManagerMock->expects($this->once())
+            ->method('addSuccess')
+            ->with(__('A total of %1 record(s) have been enabled.', $enabledPagesCount));
+        $this->messageManagerMock->expects($this->never())->method('addError');
+
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with('*/*/')
+            ->willReturnSelf();
 
         $this->assertSame($this->resultRedirectMock, $this->massEnableController->execute());
     }

From 8c8199108ecc97bbea610e29524b3828924cb124 Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@ebay.com>
Date: Tue, 25 Aug 2015 16:59:59 +0300
Subject: [PATCH 17/21] MAGETWO-40794: Widget not displaying after secondary
 creating widget

---
 app/code/Magento/Customer/Block/CustomerData.php         | 9 +++++++++
 .../view/frontend/templates/js/customer-data.phtml       | 1 +
 .../Customer/view/frontend/web/js/customer-data.js       | 7 +++++++
 3 files changed, 17 insertions(+)

diff --git a/app/code/Magento/Customer/Block/CustomerData.php b/app/code/Magento/Customer/Block/CustomerData.php
index 60f5a10b91718..f7b0c252b3f0b 100644
--- a/app/code/Magento/Customer/Block/CustomerData.php
+++ b/app/code/Magento/Customer/Block/CustomerData.php
@@ -29,4 +29,13 @@ public function getCustomerDataUrl($route)
     {
         return $this->getUrl($route, ['_secure' => $this->getRequest()->isSecure()]);
     }
+
+    /**
+     * Get sections that can not be cached on client-side
+     *
+     * @return array
+     */
+    public function getMutableSections() {
+        return ['banner'];
+    }
 }
diff --git a/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml b/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml
index 0be4fef69c4b1..f1f3a5e4f9d40 100644
--- a/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml
@@ -13,6 +13,7 @@
         '*' => ['Magento_Customer/js/customer-data' => [
             'sectionLoadUrl' => $block->getCustomerDataUrl('customer/section/load'),
             'cookieLifeTime' => $block->getCookieLifeTime(),
+            'mutableSections' => $block->getMutableSections(),
         ]],
     ]);
 ?>
diff --git a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
index f76913fee604f..6025aefc640dc 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
@@ -33,6 +33,12 @@ define([
         }
     };
 
+    var invalidateCacheBySections = function(settings) {
+        if (settings.mutableSections && _.intersection(storage.keys(), settings.mutableSections).length > 0) {
+            storage.removeAll();
+        }
+    }
+
     var dataProvider = {
         getFromStorage: function (sectionNames) {
             var result = {};
@@ -129,6 +135,7 @@ define([
             options = settings;
             invalidateCacheBySessionTimeOut(settings);
             invalidateCacheByCloseCookieSession();
+            invalidateCacheBySections(settings);
             customerData.init();
         }
     };

From 92b33a0926522deeb0038ebbce23d44bcc56bdf2 Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@ebay.com>
Date: Tue, 25 Aug 2015 17:42:52 +0300
Subject: [PATCH 18/21] MAGETWO-40794: Widget not displaying after secondary
 creating widget

---
 app/code/Magento/Customer/Block/CustomerData.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Block/CustomerData.php b/app/code/Magento/Customer/Block/CustomerData.php
index f7b0c252b3f0b..6aa592171ee99 100644
--- a/app/code/Magento/Customer/Block/CustomerData.php
+++ b/app/code/Magento/Customer/Block/CustomerData.php
@@ -35,7 +35,8 @@ public function getCustomerDataUrl($route)
      *
      * @return array
      */
-    public function getMutableSections() {
+    public function getMutableSections()
+    {
         return ['banner'];
     }
 }

From 4bf0c87a431689bbe5ca3db1f1434ad2189eecdb Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@ebay.com>
Date: Mon, 31 Aug 2015 13:23:52 +0300
Subject: [PATCH 19/21] MAGETWO-40794: Widget not displaying after secondary
 creating widget

---
 app/code/Magento/Customer/Block/CustomerData.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Block/CustomerData.php b/app/code/Magento/Customer/Block/CustomerData.php
index 6aa592171ee99..00281e9a1425c 100644
--- a/app/code/Magento/Customer/Block/CustomerData.php
+++ b/app/code/Magento/Customer/Block/CustomerData.php
@@ -31,12 +31,19 @@ public function getCustomerDataUrl($route)
     }
 
     /**
-     * Get sections that can not be cached on client-side
+     * Get sections that can not be cached on frontend-side
      *
      * @return array
      */
-    public function getMutableSections()
+    public function getNotCachedSections() {
+        return $this->nonCachedSections;
+    }
+
+    /**
+     * @return array
+     */
+    public function getNonCachedSectionKeys()
     {
-        return ['banner'];
+        return array_keys($this->nonCachedSections);
     }
 }

From 4649fc13c88047f28f29af5e20bb1167b949a66f Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@ebay.com>
Date: Mon, 31 Aug 2015 13:29:57 +0300
Subject: [PATCH 20/21] MAGETWO-40794: Widget not displaying after secondary
 creating widget

---
 app/code/Magento/Customer/Block/CustomerData.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Block/CustomerData.php b/app/code/Magento/Customer/Block/CustomerData.php
index 00281e9a1425c..50246705f9837 100644
--- a/app/code/Magento/Customer/Block/CustomerData.php
+++ b/app/code/Magento/Customer/Block/CustomerData.php
@@ -35,7 +35,8 @@ public function getCustomerDataUrl($route)
      *
      * @return array
      */
-    public function getNotCachedSections() {
+    public function getNotCachedSections()
+    {
         return $this->nonCachedSections;
     }
 

From da7678a5881e10d15253f7721d0f5dc8da2f877d Mon Sep 17 00:00:00 2001
From: Oleh Posyniak <oposyniak@ebay.com>
Date: Tue, 1 Sep 2015 18:08:33 +0300
Subject: [PATCH 21/21] MAGETWO-40794: Widget not displaying after secondary
 creating widget

---
 .../Magento/Customer/Block/CustomerData.php   | 23 +++++++++++++++++++
 .../frontend/templates/js/customer-data.phtml |  2 +-
 .../view/frontend/web/js/customer-data.js     | 11 +++++----
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Customer/Block/CustomerData.php b/app/code/Magento/Customer/Block/CustomerData.php
index 50246705f9837..66d4043f152e6 100644
--- a/app/code/Magento/Customer/Block/CustomerData.php
+++ b/app/code/Magento/Customer/Block/CustomerData.php
@@ -7,6 +7,27 @@
 
 class CustomerData extends \Magento\Framework\View\Element\Template
 {
+    /**
+     * Sections that can not be cached on frontend-side
+     *
+     * @var array
+     */
+    protected $nonCachedSections = [];
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     * @param array $nonCachedSections
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = [],
+        array $nonCachedSections = []
+    ) {
+        $this->nonCachedSections = $nonCachedSections;
+        parent::__construct($context, $data);
+    }
+
     /**
      * Get CookieLifeTime
      * @return null|string scopeCode
@@ -41,6 +62,8 @@ public function getNotCachedSections()
     }
 
     /**
+     * Get keys of sections that can not be cached on frontend-side
+     *
      * @return array
      */
     public function getNonCachedSectionKeys()
diff --git a/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml b/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml
index f1f3a5e4f9d40..9d6096765518c 100644
--- a/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml
@@ -13,7 +13,7 @@
         '*' => ['Magento_Customer/js/customer-data' => [
             'sectionLoadUrl' => $block->getCustomerDataUrl('customer/section/load'),
             'cookieLifeTime' => $block->getCookieLifeTime(),
-            'mutableSections' => $block->getMutableSections(),
+            'nonCachedSections' => $block->getNonCachedSectionKeys(),
         ]],
     ]);
 ?>
diff --git a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
index 6025aefc640dc..726fa0816d71d 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
@@ -23,6 +23,8 @@ define([
             storage.removeAll();
             var date = new Date(Date.now() + parseInt(options.cookieLifeTime, 10) * 1000);
             $.localStorage.set('mage-cache-timeout', date);
+        } else {
+            invalidateNonCachedSections(options);
         }
     };
 
@@ -33,10 +35,10 @@ define([
         }
     };
 
-    var invalidateCacheBySections = function(settings) {
-        if (settings.mutableSections && _.intersection(storage.keys(), settings.mutableSections).length > 0) {
-            storage.removeAll();
-        }
+    var invalidateNonCachedSections = function(options) {
+        _.each(options.nonCachedSections, function (sectionName) {
+            storageInvalidation.set(sectionName, true);
+        });
     }
 
     var dataProvider = {
@@ -135,7 +137,6 @@ define([
             options = settings;
             invalidateCacheBySessionTimeOut(settings);
             invalidateCacheByCloseCookieSession();
-            invalidateCacheBySections(settings);
             customerData.init();
         }
     };