Merge remote-tracking branch 'mainline/develop' into S67

# Conflicts:
#	app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
#	app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php

Author: Andrii Kasian

app/code/Magento/Search/Controller/Adminhtml/Term/Save.php

@@ -6,9 +6,8 @@
 namespace Magento\Search\Controller\Adminhtml\Term;
 
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\View\Result\PageFactory;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Search\Model\QueryFactory;
-
 use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Framework\Exception\LocalizedException;
 
@@ -21,15 +20,13 @@ class Save extends TermController
 
     /**
      * @param Context $context
-     * @param PageFactory $resultPageFactory
      * @param QueryFactory $queryFactory
      */
     public function __construct(
         Context $context,
-        PageFactory $resultPageFactory,
         QueryFactory $queryFactory
     ) {
-        parent::__construct($context, $resultPageFactory);
+        parent::__construct($context);
         $this->queryFactory = $queryFactory;
     }
 
@@ -102,8 +99,8 @@ private function loadQuery()
     private function proceedToEdit($data)
     {
         $this->_getSession()->setPageData($data);
-        /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
-        $redirectResult = $this->resultRedirectFactory->create();
+        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         return $redirectResult->setPath('search/*/edit', ['id' => $this->getRequest()->getPost('query_id', null)]);
     }
 }

app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php

@@ -32,9 +32,6 @@ class MassDeleteTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $request;
 
-    /** @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject */
-    private $redirect;
-
     /**
      * @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject
      */

app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/SaveTest.php

@@ -43,7 +43,7 @@ protected function setUp()
             ->setMethods(['setPath'])
             ->disableOriginalConstructor()
             ->getMock();
-        $redirectFactory = $this->getMockBuilder('Magento\Backend\Model\View\Result\RedirectFactory')
+        $redirectFactory = $this->getMockBuilder('\Magento\Framework\Controller\ResultFactory')
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
@@ -53,6 +53,9 @@ protected function setUp()
         $this->context->expects($this->any())
             ->method('getResultRedirectFactory')
             ->willReturn($redirectFactory);
+        $this->context->expects($this->any())
+            ->method('getResultFactory')
+            ->willReturn($redirectFactory);
 
         $this->request = $this->getMockBuilder('\Magento\Framework\App\RequestInterface')
             ->disableOriginalConstructor()
@@ -86,11 +89,6 @@ protected function setUp()
             ->method('getSession')
             ->willReturn($this->session);
 
-        $pageFactory = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
-            ->setMethods([])
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->query = $this->getMockBuilder('Magento\Search\Model\Query')
             ->disableOriginalConstructor()
             ->setMethods(['getId', 'load', 'addData', 'setIsProcessed', 'save', 'loadByQueryText', 'setStoreId'])
@@ -107,7 +105,6 @@ protected function setUp()
             'Magento\Search\Controller\Adminhtml\Term\Save',
             [
                 'context' => $this->context,
-                'resultPageFactory' => $pageFactory,
                 'queryFactory' => $queryFactory,
             ]
         );