MC-29261: [Magento Cloud] - When admin URL is different to front-base URL admin redirects to storefront

Author: serhii-balko

app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php

@@ -5,37 +5,44 @@
  */
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol;
 
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol as CurrencysymbolController;
+use Magento\CurrencySymbol\Model\System\Currencysymbol;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Filter\FilterManager;
 
 /**
  * Class Save
  */
-class Save extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol implements HttpPostActionInterface
+class Save extends CurrencysymbolController implements HttpPostActionInterface
 {
     /**
      * Save custom Currency symbol
      *
-     * @return void
+     * @return ResultInterface
      */
     public function execute()
     {
+        /** @var Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
         $symbolsDataArray = $this->getRequest()->getParam('custom_currency_symbol', null);
         if (is_array($symbolsDataArray)) {
             foreach ($symbolsDataArray as &$symbolsData) {
-                /** @var $filterManager \Magento\Framework\Filter\FilterManager */
-                $filterManager = $this->_objectManager->get(\Magento\Framework\Filter\FilterManager::class);
+                /** @var $filterManager FilterManager */
+                $filterManager = $this->_objectManager->get(FilterManager::class);
                 $symbolsData = $filterManager->stripTags($symbolsData);
             }
         }
 
         try {
-            $this->_objectManager->create(\Magento\CurrencySymbol\Model\System\Currencysymbol::class)
+            $this->_objectManager->create(Currencysymbol::class)
                 ->setCurrencySymbolsData($symbolsDataArray);
             $this->messageManager->addSuccessMessage(__('You applied the custom currency symbols.'));
         } catch (\Exception $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
         }
 
-        $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
+        return $resultRedirect->setPath('*');
     }
 }

app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/SaveTest.php

@@ -5,112 +5,126 @@
  */
 namespace Magento\CurrencySymbol\Test\Unit\Controller\Adminhtml\System\Currencysymbol;
 
+use Magento\Backend\Helper\Data;
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Backend\Model\View\Result\RedirectFactory;
+use Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol\Save;
+use Magento\CurrencySymbol\Model\System\Currencysymbol;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Filter\FilterManager;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class SaveTest
  */
-class SaveTest extends \PHPUnit\Framework\TestCase
+class SaveTest extends TestCase
 {
     /**
-     * @var \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol\Save
+     * @var Save
      */
     protected $action;
 
     /**
-     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RedirectFactory|MockObject
+     */
+    private $resultRedirectFactory;
+
+    /**
+     * @var RequestInterface|MockObject
      */
     protected $requestMock;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResponseInterface|MockObject
      */
     protected $responseMock;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ObjectManagerInterface|MockObject
      */
     protected $objectManagerMock;
 
     /**
-     * @var \Magento\CurrencySymbol\Model\System\Currencysymbol|\PHPUnit_Framework_MockObject_MockObject
+     * @var Currencysymbol|MockObject
      */
     protected $currencySymbolMock;
 
     /**
-     * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ManagerInterface|MockObject
      */
     protected $messageManagerMock;
 
     /**
-     * @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RedirectInterface|MockObject
      */
     protected $redirectMock;
 
     /**
-     * @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var Data|MockObject
      */
     protected $helperMock;
 
     /**
-     * @var \Magento\Framework\Filter\FilterManager|\PHPUnit_Framework_MockObject_MockObject
+     * @var FilterManager|MockObject
      */
     protected $filterManagerMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
-
-        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
-
-        $this->helperMock = $this->createMock(\Magento\Backend\Helper\Data::class);
-
-        $this->redirectMock = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
-
+        $this->requestMock = $this->createMock(RequestInterface::class);
+        $this->helperMock = $this->createMock(Data::class);
+        $this->redirectMock = $this->createMock(RedirectInterface::class);
         $this->responseMock = $this->createPartialMock(
-            \Magento\Framework\App\ResponseInterface::class,
+            ResponseInterface::class,
             ['setRedirect', 'sendResponse']
         );
-
-        $this->currencySymbolMock = $this->createMock(\Magento\CurrencySymbol\Model\System\Currencysymbol::class);
-
+        $this->currencySymbolMock = $this->createMock(Currencysymbol::class);
         $this->filterManagerMock = $this->createPartialMock(
-            \Magento\Framework\Filter\FilterManager::class,
+            FilterManager::class,
             ['stripTags']
         );
+        $this->objectManagerMock = $this->createMock(ObjectManagerInterface::class);
+        $this->messageManagerMock = $this->createMock(ManagerInterface::class);
+        $this->resultRedirectFactory = $this->createMock(RedirectFactory::class);
 
-        $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-
-        $this->messageManagerMock = $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
         $this->action = $objectManager->getObject(
-            \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol\Save::class,
+            Save::class,
             [
                 'request' => $this->requestMock,
                 'response' => $this->responseMock,
                 'objectManager' => $this->objectManagerMock,
                 'redirect' => $this->redirectMock,
                 'helper' => $this->helperMock,
-                'messageManager' => $this->messageManagerMock
+                'messageManager' => $this->messageManagerMock,
+                'resultRedirectFactory' => $this->resultRedirectFactory,
             ]
         );
     }
 
+    /**
+     * Test to Save custom Currency symbol
+     */
     public function testExecute()
     {
         $firstElement = 'firstElement';
         $symbolsDataArray = [$firstElement];
-        $redirectUrl = 'redirectUrl';
 
         $this->requestMock->expects($this->once())
             ->method('getParam')
             ->with('custom_currency_symbol')
             ->willReturn($symbolsDataArray);
 
-        $this->helperMock->expects($this->once())->method('getUrl')->with('*');
-        $this->redirectMock->expects($this->once())->method('getRedirectUrl')->willReturn($redirectUrl);
-
         $this->currencySymbolMock->expects($this->once())->method('setCurrencySymbolsData')->with($symbolsDataArray);
-        $this->responseMock->expects($this->once())->method('setRedirect');
 
         $this->filterManagerMock->expects($this->once())
             ->method('stripTags')
@@ -119,18 +133,22 @@ public function testExecute()
 
         $this->objectManagerMock->expects($this->once())
             ->method('create')
-            ->with(\Magento\CurrencySymbol\Model\System\Currencysymbol::class)
+            ->with(Currencysymbol::class)
             ->willReturn($this->currencySymbolMock);
 
         $this->objectManagerMock->expects($this->once())
             ->method('get')
-            ->with(\Magento\Framework\Filter\FilterManager::class)
+            ->with(FilterManager::class)
             ->willReturn($this->filterManagerMock);
 
         $this->messageManagerMock->expects($this->once())
             ->method('addSuccessMessage')
             ->with(__('You applied the custom currency symbols.'));
 
-        $this->action->execute();
+        $redirect = $this->createMock(Redirect::class);
+        $redirect->expects($this->once())->method('setPath')->with('*')->willReturnSelf();
+        $this->resultRedirectFactory->method('create')->willReturn($redirect);
+
+        $this->assertEquals($redirect, $this->action->execute());
     }
 }