Merge remote-tracking branch 'magento-l3/ACP2E-1245-V2' into ACP2E-1405

Author: thiaramus

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

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

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

@@ -81,6 +81,11 @@ public function testExecute()
             ->with(ResultFactory::TYPE_JSON, [])
             ->willReturn($this->jsonResultMock);
 
+        $this->jsonResultMock->expects($this->once())
+            ->method('setData')
+            ->with([''])
+            ->willReturn($this->jsonResultMock);
+
         $this->assertEquals($this->jsonResultMock, $this->model->execute());
     }
 
@@ -98,6 +103,11 @@ public function testExecuteSetsBadRequestResponseStatusIfBulkWasNotAcknowledgedC
             ->with(ResultFactory::TYPE_RAW, [])
             ->willReturn($this->jsonResultMock);
 
+        $this->jsonResultMock->expects($this->once())
+            ->method('setData')
+            ->with([''])
+            ->willReturn($this->jsonResultMock);
+
         $this->notificationManagementMock->expects($this->once())
             ->method('acknowledgeBulks')
             ->with($bulkUuids)