Merge remote-tracking branch 'origin/MAGETWO-53826' into PR-8

Author: Valeriy Nayda

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

@@ -79,8 +79,9 @@ public function execute()
             } else {
                 $query->saveIncrementalPopularity();
 
-                if ($query->getRedirect()) {
-                    $this->getResponse()->setRedirect($query->getRedirect());
+                $redirect = $query->getRedirect();
+                if ($redirect && $this->_url->getCurrentUrl() !== $redirect) {
+                    $this->getResponse()->setRedirect($redirect);
                     return;
                 }
             }

dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php

@@ -37,4 +37,26 @@ public function testIndexActionXSSQueryVerification()
         $this->assertNotContains($data, $responseBody);
         $this->assertContains(htmlspecialchars($data, ENT_COMPAT, 'UTF-8', false), $responseBody);
     }
+
+    /**
+     * @magentoDataFixture Magento/CatalogSearch/_files/query_redirect.php
+     */
+    public function testRedirect()
+    {
+        $this->dispatch('/catalogsearch/result/?q=query_text');
+        $responseBody = $this->getResponse();
+
+        $this->assertTrue($responseBody->isRedirect());
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogSearch/_files/query_redirect.php
+     */
+    public function testNoRedirectIfCurrentUrlAndRedirectTermAreSame()
+    {
+        $this->dispatch('/catalogsearch/result/?q=query_text&cat=41');
+        $responseBody = $this->getResponse();
+
+        $this->assertFalse($responseBody->isRedirect());
+    }
 }

dev/tests/integration/testsuite/Magento/CatalogSearch/_files/query_redirect.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\UrlInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+include 'query.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var UrlInterface $url */
+$url = $objectManager->get(UrlInterface::class);
+
+$query->setRedirect($url->getCurrentUrl() . 'catalogsearch/result/?q=query_text&cat=41')
+    ->save();