Merge remote-tracking branch 'local/ACP2E-1405' into PR_25_NOV_2022

Author: o-dubovyk

app/code/Magento/AsynchronousOperations/Controller/Adminhtml/Notification/Dismiss.php

@@ -8,13 +8,13 @@
 use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
 use Magento\Backend\App\Action\Context;
 use Magento\Backend\App\Action;
-use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
 /**
  * Class Bulk Notification Dismiss Controller
  */
-class Dismiss extends Action implements HttpGetActionInterface
+class Dismiss extends Action implements HttpPostActionInterface
 {
     /**
      * @var BulkNotificationManagement
@@ -56,7 +56,7 @@ public function execute()
         $isAcknowledged = $this->notificationManagement->acknowledgeBulks($bulkUuids);
 
         /** @var \Magento\Framework\Controller\Result\Json $result */
-        $result = $this->resultFactory->create(ResultFactory::TYPE_RAW);
+        $result = $this->resultFactory->create(ResultFactory::TYPE_JSON)->setData(['']);
         if (!$isAcknowledged) {
             $result->setHttpResponseCode(400);
         }

app/code/Magento/AsynchronousOperations/Test/Unit/Controller/Adminhtml/Notification/DismissTest.php

@@ -11,7 +11,6 @@
 use Magento\AsynchronousOperations\Model\BulkNotificationManagement;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\Json;
-use Magento\Framework\Controller\Result\Raw;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -44,11 +43,6 @@ class DismissTest extends TestCase
      */
     private $jsonResultMock;
 
-    /**
-     * @var MockObject
-     */
-    private $rawResultMock;
-
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
@@ -84,10 +78,15 @@ public function testExecute()
 
         $this->resultFactoryMock->expects($this->once())
             ->method('create')
-            ->with(ResultFactory::TYPE_RAW, [])
-            ->willReturn($this->rawResultMock);
+            ->with(ResultFactory::TYPE_JSON, [])
+            ->willReturn($this->jsonResultMock);
+
+        $this->jsonResultMock->expects($this->once())
+            ->method('setData')
+            ->with([''])
+            ->willReturn($this->jsonResultMock);
 
-        $this->assertEquals($this->rawResultMock, $this->model->execute());
+        $this->assertEquals($this->jsonResultMock, $this->model->execute());
     }
 
     public function testExecuteSetsBadRequestResponseStatusIfBulkWasNotAcknowledgedCorrectly()
@@ -101,7 +100,12 @@ public function testExecuteSetsBadRequestResponseStatusIfBulkWasNotAcknowledgedC
 
         $this->resultFactoryMock->expects($this->once())
             ->method('create')
-            ->with(ResultFactory::TYPE_RAW, [])
+            ->with(ResultFactory::TYPE_JSON, [])
+            ->willReturn($this->jsonResultMock);
+
+        $this->jsonResultMock->expects($this->once())
+            ->method('setData')
+            ->with([''])
             ->willReturn($this->jsonResultMock);
 
         $this->notificationManagementMock->expects($this->once())