ENGCOM-2588: [Forwardport] Issue 8131 - Use Redirect Factory to Allow Error Message Display on Advanced Search #17210

Author: Stanislav Idolov

app/code/Magento/CatalogSearch/Controller/Advanced/Result.php

@@ -6,7 +6,6 @@
  */
 namespace Magento\CatalogSearch\Controller\Advanced;
 
-use Magento\Catalog\Model\Layer\Resolver;
 use Magento\CatalogSearch\Model\Advanced as ModelAdvanced;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\UrlFactory;
@@ -45,7 +44,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -58,7 +57,9 @@ public function execute()
             $defaultUrl = $this->_urlFactory->create()
                 ->addQueryParams($this->getRequest()->getQueryValue())
                 ->getUrl('*/*/');
-            $this->getResponse()->setRedirect($this->_redirect->error($defaultUrl));
+            $resultRedirect = $this->resultRedirectFactory->create();
+            $resultRedirect->setUrl($this->_redirect->error($defaultUrl));
+            return $resultRedirect;
         }
     }
 }

app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\CatalogSearch\Test\Unit\Controller\Advanced;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ResultTest extends \PHPUnit\Framework\TestCase
 {
     public function testResultActionFiltersSetBeforeLoadLayout()
@@ -49,4 +52,90 @@ function ($added) use (&$filters) {
         );
         $instance->execute();
     }
+
+    public function testUrlSetOnException()
+    {
+        $redirectResultMock = $this->createMock(\Magento\Framework\Controller\Result\Redirect::class);
+        $redirectResultMock->expects($this->once())
+            ->method('setUrl');
+
+        $redirectFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\RedirectFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $redirectFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($redirectResultMock);
+
+        $catalogSearchAdvanced = $this->createPartialMock(
+            \Magento\CatalogSearch\Model\Advanced::class,
+            ['addFilters']
+        );
+
+        $catalogSearchAdvanced->expects($this->once())->method('addFilters')->will(
+            $this->throwException(new \Magento\Framework\Exception\LocalizedException(
+                new \Magento\Framework\Phrase("Test Exception")
+            ))
+        );
+
+        $responseMock = $this->createMock(\Magento\Framework\Webapi\Response::class);
+        $requestMock = $this->createPartialMock(
+            \Magento\Framework\App\Request\Http::class,
+            ['getQueryValue']
+        );
+        $requestMock->expects($this->any())->method('getQueryValue')->willReturn(['key' => 'value']);
+
+        $redirectMock = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
+        $redirectMock->expects($this->any())->method('error')->with('urlstring');
+
+        $messageManagerMock = $this->createMock(\Magento\Framework\Message\Manager::class);
+
+        $eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
+
+        $contextMock = $this->createMock(\Magento\Framework\App\Action\Context::class);
+        $contextMock->expects($this->any())
+            ->method('getRequest')
+            ->willReturn($requestMock);
+        $contextMock->expects($this->any())
+            ->method('getResponse')
+            ->willReturn($responseMock);
+        $contextMock->expects($this->any())
+            ->method('getRedirect')
+            ->willReturn($redirectMock);
+        $contextMock->expects($this->any())
+            ->method('getMessageManager')
+            ->willReturn($messageManagerMock);
+        $contextMock->expects($this->any())
+            ->method('getEventManager')
+            ->willReturn($eventManagerMock);
+        $contextMock->expects($this->any())
+            ->method('getResultRedirectFactory')
+            ->willReturn($redirectFactoryMock);
+
+        $urlMock = $this->createMock(\Magento\Framework\Url::class);
+        $urlMock->expects($this->once())
+            ->method('addQueryParams')
+            ->willReturnSelf();
+        $urlMock->expects($this->once())
+            ->method('getUrl')
+            ->willReturn("urlstring");
+
+        $urlFactoryMock = $this->createMock(\Magento\Framework\UrlFactory::class);
+        $urlFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($urlMock));
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        /** @var \Magento\CatalogSearch\Controller\Advanced\Result $instance */
+        $instance = $objectManager->getObject(
+            \Magento\CatalogSearch\Controller\Advanced\Result::class,
+            ['context' => $contextMock,
+            'catalogSearchAdvanced' => $catalogSearchAdvanced,
+            'urlFactory' => $urlFactoryMock
+            ]
+        );
+        $this->assertEquals($redirectResultMock, $instance->execute());
+    }
 }