Merge remote-tracking branch 'origin/MC-19716' into 2.3-develop-pr32

Author: serhii-balko

app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php

@@ -1,12 +1,19 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
-class NewActionHtml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Rule\Model\Condition\AbstractCondition;
+use Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
+use Magento\SalesRule\Model\Rule;
+
+/**
+ * New action html action
+ */
+class NewActionHtml extends Quote implements HttpPostActionInterface
 {
     /**
      * New action html action
@@ -15,8 +22,10 @@ class NewActionHtml extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
      */
     public function execute()
     {
-        $id = $this->getRequest()->getParam('id');
-        $formName = $this->getRequest()->getParam('form');
+        $id = $this->getRequest()
+            ->getParam('id');
+        $formName = $this->getRequest()
+            ->getParam('form_namespace');
         $typeArr = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type')));
         $type = $typeArr[0];
 
@@ -27,20 +36,22 @@ public function execute()
         )->setType(
             $type
         )->setRule(
-            $this->_objectManager->create(\Magento\SalesRule\Model\Rule::class)
+            $this->_objectManager->create(Rule::class)
         )->setPrefix(
             'actions'
         );
         if (!empty($typeArr[1])) {
             $model->setAttribute($typeArr[1]);
         }
 
-        if ($model instanceof \Magento\Rule\Model\Condition\AbstractCondition) {
+        if ($model instanceof AbstractCondition) {
             $model->setJsFormObject($formName);
+            $model->setFormName($formName);
             $html = $model->asHtmlRecursive();
         } else {
             $html = '';
         }
-        $this->getResponse()->setBody($html);
+        $this->getResponse()
+            ->setBody($html);
     }
 }

dev/tests/integration/testsuite/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtmlTest.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
+
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * New action html test
+ *
+ * @magentoAppArea adminhtml
+ */
+class NewActionHtmlTest extends AbstractBackendController
+{
+    /**
+     * @var string
+     */
+    protected $resource = 'Magento_SalesRule::quote';
+
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales_rule/promo_quote/newActionHtml';
+
+    /**
+     * @var string
+     */
+    private $formName = 'test_form';
+
+    /**
+     * Test verifies that execute method has the proper data-form-part value in html response
+     *
+     * @return void
+     */
+    public function testExecute(): void
+    {
+        $this->prepareRequest();
+        $this->dispatch($this->uri);
+        $html = $this->getResponse()
+            ->getBody();
+        $this->assertContains($this->formName, $html);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest();
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest();
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * Prepare request
+     *
+     * @return void
+     */
+    private function prepareRequest(): void
+    {
+        $this->getRequest()->setParams(
+            [
+                'id' => 1,
+                'form_namespace' => $this->formName,
+                'type' => 'Magento\SalesRule\Model\Rule\Condition\Product|quote_item_price',
+            ]
+        )->setMethod('POST');
+    }
+}