From d2c2c0067d19b1624e757776695ad19be4c49f52 Mon Sep 17 00:00:00 2001
From: Yevhenii Dumskyi <yevhenii.dumskyi@gmail.com>
Date: Sat, 6 Oct 2018 12:59:45 +0300
Subject: [PATCH] Fix no results handle layout update

---
 .../Controller/Advanced/Result.php            |  4 +++-
 .../CatalogSearch/Controller/Result/Index.php |  4 +++-
 .../Unit/Controller/Advanced/ResultTest.php   | 24 +++++++++++++++----
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
index dfbd46aa6a1cf..6cefacaf785e9 100644
--- a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
+++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
@@ -64,7 +64,9 @@ public function execute()
 
             $handles = null;
             if ($size == 0) {
-                $handles = [static::DEFAULT_NO_RESULT_HANDLE];
+                $this->_view->getPage()->initLayout();
+                $handles = $this->_view->getLayout()->getUpdate()->getHandles();
+                $handles[] = static::DEFAULT_NO_RESULT_HANDLE;
             }
 
             $this->_view->loadLayout($handles);
diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
index 3e0569ef7bfe8..a016beb0215b4 100644
--- a/app/code/Magento/CatalogSearch/Controller/Result/Index.php
+++ b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
@@ -95,7 +95,9 @@ public function execute()
 
             $handles = null;
             if ($query->getNumResults() == 0) {
-                $handles = [static::DEFAULT_NO_RESULT_HANDLE];
+                $this->_view->getPage()->initLayout();
+                $handles = $this->_view->getLayout()->getUpdate()->getHandles();
+                $handles[] = static::DEFAULT_NO_RESULT_HANDLE;
             }
 
             if (empty($getAdditionalRequestParameters) &&
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
index d4229ff934e9b..71ba6589eee09 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php
@@ -139,9 +139,10 @@ public function testUrlSetOnException()
         /** @var \Magento\CatalogSearch\Controller\Advanced\Result $instance */
         $instance = $objectManager->getObject(
             \Magento\CatalogSearch\Controller\Advanced\Result::class,
-            ['context' => $contextMock,
-            'catalogSearchAdvanced' => $catalogSearchAdvanced,
-            'urlFactory' => $urlFactoryMock
+            [
+                'context'               => $contextMock,
+                'catalogSearchAdvanced' => $catalogSearchAdvanced,
+                'urlFactory'            => $urlFactoryMock
             ]
         );
         $this->assertEquals($redirectResultMock, $instance->execute());
@@ -151,10 +152,25 @@ public function testNoResultsHandle()
     {
         $expectedQuery = 'notExistTerm';
 
-        $view = $this->createPartialMock(\Magento\Framework\App\View::class, ['loadLayout', 'renderLayout']);
+        $update = $this->createPartialMock(\Magento\Framework\View\Model\Layout\Merge::class, ['getHandles']);
+        $update->expects($this->once())->method('getHandles')->will($this->returnValue([]));
+
+        $layout = $this->createPartialMock(\Magento\Framework\View\Result\Layout::class, ['getUpdate']);
+        $layout->expects($this->once())->method('getUpdate')->will($this->returnValue($update));
+
+        $page = $this->createPartialMock(\Magento\Framework\View\Result\Page::class, ['initLayout']);
+
+        $view = $this->createPartialMock(
+            \Magento\Framework\App\View::class,
+            ['loadLayout', 'renderLayout', 'getPage', 'getLayout']
+        );
+
         $view->expects($this->once())->method('loadLayout')
             ->with([\Magento\CatalogSearch\Controller\Advanced\Result::DEFAULT_NO_RESULT_HANDLE]);
 
+        $view->expects($this->once())->method('getPage')->will($this->returnValue($page));
+        $view->expects($this->once())->method('getLayout')->will($this->returnValue($layout));
+
         $request = $this->createPartialMock(\Magento\Framework\App\Console\Request::class, ['getQueryValue']);
         $request->expects($this->once())->method('getQueryValue')->will($this->returnValue($expectedQuery));