Merge remote-tracking branch 'origin/ACP2E-391' into L3_Arrows_PR_20220221

Author: nishant04412

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php

@@ -24,6 +24,7 @@
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Product\Attribute\Repository as ProductAttributeRepository;
 
 /**
  * Test class for Product adminhtml actions
@@ -196,7 +197,6 @@ public function testIndexAction()
 
     /**
      * Testing existing product edit page.
-     *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testEditAction()
@@ -235,6 +235,22 @@ public function testEditAction()
         );
     }
 
+    /**
+     * Testing product short description has Wysiwyg after creating category short_description attribute.
+     * @magentoDataFixture Magento/Catalog/_files/category_custom_short_description_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testProductShortDescriptionHasWysiwygEditor()
+    {
+        /** @var ProductRepository $repository */
+        $repository = $this->repositoryFactory->create();
+        $product = $repository->get('simple');
+        $this->dispatch('backend/catalog/product/edit/id/' . $product->getEntityId());
+        $body = $this->getResponse()->getBody();
+        $this->assertMatchesRegularExpression('/editorproduct_form_short_description/', $body);
+        $this->assertMatchesRegularExpression('/buttonsproduct_form_short_description/', $body);
+    }
+
     /**
      * Test create product with already existing url key.
      *

dev/tests/integration/testsuite/Magento/Catalog/_files/category_custom_short_description_attribute.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var Attribute $attribute */
+
+use Magento\Catalog\Model\Category\AttributeFactory;
+use Magento\Catalog\Model\Category\Attribute;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$attributeFactory = Bootstrap::getObjectManager()->get(AttributeFactory::class);
+$attribute = $attributeFactory->create();
+$attribute->setAttributeCode('short_description')
+    ->setEntityTypeId(3)
+    ->setBackendType('text')
+    ->setFrontendInput('textarea')
+    ->setIsGlobal(1)
+    ->setIsUserDefined(1);
+$attribute->save();

dev/tests/integration/testsuite/Magento/Catalog/_files/category_custom_short_description_attribute_rollback.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var Registry $registry */
+
+use Magento\Catalog\Model\Category\AttributeFactory;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var AttributeFactory $attributeFactory */
+$attributeFactory = $objectManager->get(AttributeFactory::class);
+$attribute = $attributeFactory->create();
+
+$attribute->loadByCode(3, 'short_description');
+
+if ($attribute->getId()) {
+    $attribute->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);