From 1f3a84448e69e36b374b62abf482aef706a731ba Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@magento.com>
Date: Fri, 12 Aug 2016 13:32:24 +0300
Subject: [PATCH 01/12] MAGETWO-55234: Image does not save when edited via
 right-click and "Insert/Edit Image"

---
 lib/web/tiny_mce/plugins/advimage/js/image.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/web/tiny_mce/plugins/advimage/js/image.js b/lib/web/tiny_mce/plugins/advimage/js/image.js
index 7e3cf00eb003c..f87c40ff8fce4 100644
--- a/lib/web/tiny_mce/plugins/advimage/js/image.js
+++ b/lib/web/tiny_mce/plugins/advimage/js/image.js
@@ -184,6 +184,7 @@ var ImageDialog = {
 		tinyMCEPopup.editor.execCommand('mceRepaint');
 		tinyMCEPopup.editor.focus();
 		tinyMCEPopup.close();
+        ed.onChange.dispatch(ed);
 	},
 
 	getAttrib : function(e, at) {

From 3278cd79252c43d24a1ecf5e511e0665fc30bf1a Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@magento.com>
Date: Mon, 15 Aug 2016 13:15:55 +0300
Subject: [PATCH 02/12] MAGETWO-53135: [GITHUB] Prices of related products on
 PDP changes according to product custom options. #4588

---
 .../Catalog/view/frontend/templates/product/view/form.phtml   | 4 +++-
 .../view/frontend/templates/product/view/options.phtml        | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
index f6dd2a0033fd4..f23544a7734fb 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
@@ -42,7 +42,9 @@
         'jquery',
         'Magento_Catalog/js/price-box'
     ], function($){
-        var priceBoxes = $('[data-role=priceBox]');
+        var dataPriceBoxSelector = '[data-role=priceBox]',
+            dataProductIdSelector = '[data-product-id=<?php echo $block->escapeHtml($_product->getId());?>]',
+            priceBoxes = $(dataPriceBoxSelector + dataProductIdSelector);
 
         priceBoxes = priceBoxes.filter(function(index, elem){
             return !$(elem).find('.price-from').length;
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
index 97f844067f068..ec8f3c86483c9 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
@@ -10,6 +10,7 @@
 ?>
 
 <?php $_options = $block->decorateArray($block->getOptions()) ?>
+<?php $_productId = $block->getProduct()->getId() ?>
 <?php if (count($_options)):?>
 <script type="text/x-magento-init">
     {
@@ -17,7 +18,7 @@
             "priceOptions": {
                 "optionConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig()?>,
                 "controlContainer": ".field",
-                "priceHolderSelector": "[data-role=priceBox]"
+                "priceHolderSelector": "[data-product-id='<?php echo $_productId?>'][data-role=priceBox]"
             }
         }
     }

From 37d9c1d8de467d1cfbae8d4c0af854fb14736c9a Mon Sep 17 00:00:00 2001
From: Olga Nakonechna <onakonechna@magento.com>
Date: Mon, 15 Aug 2016 13:23:13 +0300
Subject: [PATCH 03/12] MAGETWO-55234: Image does not save when edited via
 right-click and "Insert/Edit Image"

---
 lib/web/tiny_mce/plugins/advimage/js/image.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web/tiny_mce/plugins/advimage/js/image.js b/lib/web/tiny_mce/plugins/advimage/js/image.js
index f87c40ff8fce4..821806409863e 100644
--- a/lib/web/tiny_mce/plugins/advimage/js/image.js
+++ b/lib/web/tiny_mce/plugins/advimage/js/image.js
@@ -184,7 +184,7 @@ var ImageDialog = {
 		tinyMCEPopup.editor.execCommand('mceRepaint');
 		tinyMCEPopup.editor.focus();
 		tinyMCEPopup.close();
-        ed.onChange.dispatch(ed);
+		ed.onChange.dispatch(ed);
 	},
 
 	getAttrib : function(e, at) {

From 5bb8c1f7ac839fe081e2351cd2d39665c0f854c2 Mon Sep 17 00:00:00 2001
From: vnayda <vnayda@magento.com>
Date: Tue, 16 Aug 2016 12:26:43 +0300
Subject: [PATCH 04/12] MAGETWO-54458: Scope selector on product page does not
 display all related websites for restricted user

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

diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
index 2989da19b9f04..eb113e45c45d6 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher.php
@@ -152,11 +152,7 @@ public function getWebsites()
     {
         $websites = $this->_storeManager->getWebsites();
         if ($websiteIds = $this->getWebsiteIds()) {
-            foreach (array_keys($websites) as $websiteId) {
-                if (!in_array($websiteId, $websiteIds)) {
-                    unset($websites[$websiteId]);
-                }
-            }
+            $websites = array_intersect_key($websites, array_flip($websiteIds));
         }
         return $websites;
     }

From 0a812ebec7e0d0dbc8475f18a0d1c4900c2ab7dd Mon Sep 17 00:00:00 2001
From: Olha Nakonechna <onakonechna@magento.com>
Date: Tue, 16 Aug 2016 15:07:50 +0300
Subject: [PATCH 05/12] MAGETWO-53135: [GITHUB] Prices of related products on
 PDP changes according to product custom options. #4588

---
 .../Catalog/view/frontend/templates/product/view/form.phtml     | 2 +-
 .../Catalog/view/frontend/templates/product/view/options.phtml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
index f23544a7734fb..f27f9ecea4515 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
@@ -43,7 +43,7 @@
         'Magento_Catalog/js/price-box'
     ], function($){
         var dataPriceBoxSelector = '[data-role=priceBox]',
-            dataProductIdSelector = '[data-product-id=<?php echo $block->escapeHtml($_product->getId());?>]',
+            dataProductIdSelector = '[data-product-id=<?php echo $block->escapeHtml($_product->getId())?>]',
             priceBoxes = $(dataPriceBoxSelector + dataProductIdSelector);
 
         priceBoxes = priceBoxes.filter(function(index, elem){
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
index ec8f3c86483c9..e7918f7da37f6 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
@@ -18,7 +18,7 @@
             "priceOptions": {
                 "optionConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig()?>,
                 "controlContainer": ".field",
-                "priceHolderSelector": "[data-product-id='<?php echo $_productId?>'][data-role=priceBox]"
+                "priceHolderSelector": "[data-product-id='<?php echo /* @noEscape */ $_productId?>'][data-role=priceBox]"
             }
         }
     }

From 1bfe96185af968bca2de6d9d112c7343c4710a85 Mon Sep 17 00:00:00 2001
From: Olha Nakonechna <onakonechna@magento.com>
Date: Tue, 16 Aug 2016 16:41:35 +0300
Subject: [PATCH 06/12] MAGETWO-53135: [GITHUB] Prices of related products on
 PDP changes according to product custom options. #4588

---
 .../Catalog/view/frontend/templates/product/view/options.phtml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
index e7918f7da37f6..9da72303f068d 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml
@@ -18,7 +18,7 @@
             "priceOptions": {
                 "optionConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig()?>,
                 "controlContainer": ".field",
-                "priceHolderSelector": "[data-product-id='<?php echo /* @noEscape */ $_productId?>'][data-role=priceBox]"
+                "priceHolderSelector": "[data-product-id='<?php echo $block->escapeHtml($_productId)?>'][data-role=priceBox]"
             }
         }
     }

From 29db725aed0fd99e385d0201948aa65c051e2d5f Mon Sep 17 00:00:00 2001
From: Illia Grybkov <igrybkov@magento.com>
Date: Tue, 16 Aug 2016 10:59:21 +0300
Subject: [PATCH 07/12] MAGETWO-56954: Shopping cart page - Reordered items
 count is not getting updated at mini cart

---
 .../Sales/view/frontend/templates/order/history.phtml        | 5 ++++-
 .../Sales/view/frontend/templates/order/info/buttons.phtml   | 5 ++++-
 .../Magento/Sales/view/frontend/templates/order/recent.phtml | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
index 47ea803530f14..c900b72af5556 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
@@ -42,7 +42,10 @@
                                 <span><?php /* @escapeNotVerified */ echo __('View Order') ?></span>
                             </a>
                             <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
-                                <a href="<?php /* @escapeNotVerified */ echo $block->getReorderUrl($_order) ?>" class="action order">
+                                <a href="#" data-post='<?php /* @escapeNotVerified */ echo
+                                $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
+                                    ->getPostData($block->getReorderUrl($_order))
+                                ?>' class="action order">
                                     <span><?php /* @escapeNotVerified */ echo __('Reorder') ?></span>
                                 </a>
                             <?php endif ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
index 2e1145662c3f8..9643bd2267622 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
@@ -10,7 +10,10 @@
 <div class="actions">
     <?php  $_order = $block->getOrder() ?>
     <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
-        <a class="action reorder" href="<?php /* @escapeNotVerified */ echo $block->getReorderUrl($_order) ?>">
+        <a href="#" data-post='<?php /* @escapeNotVerified */ echo
+        $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
+            ->getPostData($block->getReorderUrl($_order))
+        ?>' class="action order">
             <span><?php /* @escapeNotVerified */ echo __('Reorder') ?></span>
         </a>
     <?php endif ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
index b351fb6c86d54..caf8a4abd2cd8 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
@@ -46,7 +46,10 @@
                                     <span><?php /* @escapeNotVerified */ echo __('View Order') ?></span>
                                 </a>
                                 <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
-                                    <a href="<?php /* @escapeNotVerified */ echo $block->getReorderUrl($_order) ?>" class="action order">
+                                    <a href="#" data-post='<?php /* @escapeNotVerified */ echo
+                                    $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
+                                        ->getPostData($block->getReorderUrl($_order))
+                                    ?>' class="action order">
                                         <span><?php /* @escapeNotVerified */ echo __('Reorder') ?></span>
                                     </a>
                                 <?php endif ?>

From e3068d223b69b02bcc5ca2d3a0cb91b2286f1b91 Mon Sep 17 00:00:00 2001
From: Maksym Aposov <maposov@magento.com>
Date: Mon, 22 Aug 2016 15:39:00 +0300
Subject: [PATCH 08/12] MAGETWO-53370: Swatches not displayed when using search

---
 .../layout/catalogsearch_advanced_result.xml    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 app/code/Magento/Swatches/view/frontend/layout/catalogsearch_advanced_result.xml

diff --git a/app/code/Magento/Swatches/view/frontend/layout/catalogsearch_advanced_result.xml b/app/code/Magento/Swatches/view/frontend/layout/catalogsearch_advanced_result.xml
new file mode 100644
index 0000000000000..3b17bac8e1540
--- /dev/null
+++ b/app/code/Magento/Swatches/view/frontend/layout/catalogsearch_advanced_result.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <css src="Magento_Swatches::css/swatches.css"/>
+    </head>
+    <body>
+        <referenceBlock name="category.product.type.details.renderers">
+            <block class="Magento\Swatches\Block\Product\Renderer\Listing\Configurable" as="configurable" template="Magento_Swatches::product/listing/renderer.phtml" />
+        </referenceBlock>
+    </body>
+</page>

From f5a60e9a3bff1bae1d9b24ac225b566dca1117b2 Mon Sep 17 00:00:00 2001
From: Maksym Aposov <maposov@magento.com>
Date: Thu, 25 Aug 2016 12:49:10 +0300
Subject: [PATCH 09/12] MAGETWO-54458: Scope selector on product page does not
 display all related websites for restricted user

---
 .../Magento/Backend/Block/Store/Switcher.php  |  2 -
 .../Test/Unit/Block/Store/SwitcherTest.php    | 53 +++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php

diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
index eb113e45c45d6..cd15704952b23 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher.php
@@ -8,8 +8,6 @@
 
 /**
  * Store switcher block
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Switcher extends \Magento\Backend\Block\Template
 {
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php b/app/code/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php
new file mode 100644
index 0000000000000..e0229d54ba233
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Test\Unit\Block\Cache;
+
+class SwitcherTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Backend\Block\Store\Switcher
+     */
+    private $switcherBlock;
+
+    private $storeManagerMock;
+
+    protected function setUp()
+    {
+        $this->storeManagerMock = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $context = $objectHelper->getObject(
+            \Magento\Backend\Block\Template\Context::class,
+            [
+                'storeManager' => $this->storeManagerMock,
+            ]
+        );
+
+        $this->switcherBlock = $objectHelper->getObject(
+            \Magento\Backend\Block\Store\Switcher::class,
+            ['context' => $context]
+        );
+    }
+
+    public function testGetWebsites()
+    {
+        $websiteMock =  $this->getMock(\Magento\Store\Model\Website::class, [], [], '', false);
+        $websites = [0 => $websiteMock, 1 => $websiteMock];
+        $this->storeManagerMock->expects($this->once())->method('getWebsites')->will($this->returnValue($websites));
+        $this->assertEquals($websites, $this->switcherBlock->getWebsites());
+    }
+
+    public function testGetWebsitesIfSetWebsiteIds()
+    {
+        $websiteMock =  $this->getMock(\Magento\Store\Model\Website::class, [], [], '', false);
+        $websites = [0 => $websiteMock, 1 => $websiteMock];
+        $this->storeManagerMock->expects($this->once())->method('getWebsites')->will($this->returnValue($websites));
+
+        $this->switcherBlock->setWebsiteIds([1]);
+        $expected = [1 => $websiteMock];
+        $this->assertEquals($expected, $this->switcherBlock->getWebsites());
+    }
+}

From e8376bfb9432c34c8ef70a24824b524414ab99e5 Mon Sep 17 00:00:00 2001
From: Maksym Aposov <maposov@magento.com>
Date: Thu, 25 Aug 2016 14:39:36 +0300
Subject: [PATCH 10/12] MAGETWO-54458: Scope selector on product page does not
 display all related websites for restricted user

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

diff --git a/app/code/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php b/app/code/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php
index e0229d54ba233..a4ba16ea1bdaa 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Backend\Test\Unit\Block\Cache;
+namespace Magento\Backend\Test\Unit\Block\Store;
 
 class SwitcherTest extends \PHPUnit_Framework_TestCase
 {

From 2db5aa15722307fb6ad703627933224f5f74bbe3 Mon Sep 17 00:00:00 2001
From: Andrii Dimov <adimov@magento.com>
Date: Thu, 25 Aug 2016 14:51:08 +0300
Subject: [PATCH 11/12] MAGETWO-54718: [GitHub] Exception thrown where no
 Product Image file found #5184 #5497 #5871

---
 .../Product/Helper/Form/Gallery/Content.php   | 29 ++------------
 .../Helper/Form/Gallery/ContentTest.php       | 39 ++++---------------
 2 files changed, 11 insertions(+), 57 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
index 262ba8cccc27e..fa863176952b1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -40,11 +40,6 @@ class Content extends \Magento\Backend\Block\Widget
      */
     private $imageHelper;
 
-    /**
-     * @var \Magento\Framework\View\Asset\Repository
-     */
-    private $assetRepo;
-
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
@@ -139,7 +134,7 @@ public function getImagesJson()
             is_array($value['images']) &&
             count($value['images'])
         ) {
-            $mediaDir = $this->_filesystem->getDirectoryRead(DirectoryList::MEDIA);            
+            $mediaDir = $this->_filesystem->getDirectoryRead(DirectoryList::MEDIA);
             $images = $this->sortImagesByPosition($value['images']);
             foreach ($images as &$image) {
                 $image['url'] = $this->_mediaConfig->getMediaUrl($image['file']);
@@ -147,12 +142,8 @@ public function getImagesJson()
                     $fileHandler = $mediaDir->stat($this->_mediaConfig->getMediaPath($image['file']));
                     $image['size'] = $fileHandler['size'];
                 } catch (FileSystemException $e) {
-                    $staticDir = $this->_filesystem->getDirectoryRead(DirectoryList::STATIC_VIEW);
-                    $image['url'] = $this->getImageHelper()->getDefaultPlaceholderUrl('thumbnail');
-                    $fileHandler = $staticDir->stat(
-                        $this->getAssetRepo()->createAsset($this->getImageHelper()->getPlaceholder('thumbnail'))->getPath()
-                    );
-                    $image['size'] = $fileHandler['size'];
+                    $image['url'] = $this->getImageHelper()->getDefaultPlaceholderUrl('small_image');
+                    $image['size'] = 0;
                     $this->_logger->warning($e);
                 }
             }
@@ -261,18 +252,4 @@ private function getImageHelper()
         }
         return $this->imageHelper;
     }
-
-    /**
-     * @return \Magento\Framework\View\Asset\Repository
-     * @deprecated
-     */
-    private function getAssetRepo()
-    {
-        if ($this->assetRepo === null) {
-            $this->assetRepo = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get('\Magento\Framework\View\Asset\Repository');
-        }
-
-        return $this->assetRepo;
-    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
index 33faf5963c910..0ec8e53357523 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
@@ -46,11 +46,6 @@ class ContentTest extends \PHPUnit_Framework_TestCase
      */
     protected $imageHelper;
 
-    /**
-     * @var \Magento\Framework\View\Asset\Repository|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $assetRepo;
-
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
      */
@@ -171,30 +166,17 @@ public function testGetImagesJsonWithException()
     {
         $this->imageHelper = $this->getMockBuilder('Magento\Catalog\Helper\Image')
             ->disableOriginalConstructor()
-            ->setMethods(['getDefaultPlaceholderUrl', 'getPlaceholder'])
-            ->getMock();
-
-        $this->assetRepo = $this->getMockBuilder('Magento\Framework\View\Asset\Repository')
-            ->disableOriginalConstructor()
-            ->setMethods(['createAsset', 'getPath'])
+            ->setMethods(['getDefaultPlaceholderUrl'])
             ->getMock();
         
         $this->objectManager->setBackwardCompatibleProperty(
             $this->content,
             'imageHelper',
-            $this->imageHelper          
-        );
-
-        $this->objectManager->setBackwardCompatibleProperty(
-            $this->content,
-            'assetRepo',
-            $this->assetRepo
+            $this->imageHelper
         );
 
         $placeholderUrl = 'url_to_the_placeholder/placeholder.jpg';
 
-        $sizePlaceholder = ['size' => 399659];
-
         $imagesResult = [
             [
                 'value_id' => '2',
@@ -202,7 +184,7 @@ public function testGetImagesJsonWithException()
                 'media_type' => 'image',
                 'position' => '0',
                 'url' => 'url_to_the_placeholder/placeholder.jpg',
-                'size' => 399659
+                'size' => 0
             ],
             [
                 'value_id' => '1',
@@ -210,7 +192,7 @@ public function testGetImagesJsonWithException()
                 'media_type' => 'image',
                 'position' => '1',
                 'url' => 'url_to_the_placeholder/placeholder.jpg',
-                'size' => 399659
+                'size' => 0
             ]
         ];
 
@@ -238,20 +220,15 @@ public function testGetImagesJsonWithException()
         $this->mediaConfigMock->expects($this->any())->method('getMediaPath');
         $this->readMock->expects($this->any())->method('stat')->willReturnOnConsecutiveCalls(
             $this->throwException(
-                new \Magento\Framework\Exception\FileSystemException(new \Magento\Framework\Phrase('test'))
+                new \Magento\Framework\Exception\FileSystemException(new Phrase('test'))
             ),
-            $sizePlaceholder,
             $this->throwException(
-                new \Magento\Framework\Exception\FileSystemException(new \Magento\Framework\Phrase('test'))
-                        ),
-            $sizePlaceholder
+                new \Magento\Framework\Exception\FileSystemException(new Phrase('test'))
+            )
         );
         $this->imageHelper->expects($this->any())->method('getDefaultPlaceholderUrl')->willReturn($placeholderUrl);
-        $this->imageHelper->expects($this->any())->method('getPlaceholder');
-        $this->assetRepo->expects($this->any())->method('createAsset')->willReturnSelf();
-        $this->assetRepo->expects($this->any())->method('getPath');
         $this->jsonEncoderMock->expects($this->once())->method('encode')->willReturnCallback('json_encode');
 
         $this->assertSame(json_encode($imagesResult), $this->content->getImagesJson());
-        }
+    }
 }

From 1c45680f0834e255af958ba1f24886e91d085488 Mon Sep 17 00:00:00 2001
From: sdwright <swright@magento.com>
Date: Mon, 29 Aug 2016 15:23:54 -0500
Subject: [PATCH 12/12] MAGETWO-55506: [PAT test investigation] - JMeter log
 clean up

- Removed logging of category.
---
 setup/performance-toolkit/benchmark.jmx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 4f212b4c3d9f4..c2ef9ebbea04d 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -790,7 +790,7 @@ if (1 == Integer.parseInt(vars.get("category_name_counter"))) {
 } else {
     categoryNamesList = props.get("category_names_list");
 }
-log.info("category name: " + vars.get("category_name"));
+
 categoryNamesList.add(vars.get("category_name"));</stringProp>
           <stringProp name="BeanShellSampler.filename"/>
           <stringProp name="BeanShellSampler.parameters"/>