Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into MC-42704

Author: pradeep.rauthan

app/code/Magento/Ui/view/base/web/js/form/element/wysiwyg.js

@@ -137,7 +137,7 @@ define([
             if (this.$wysiwygEditorButton && disabled) {
                 this.$wysiwygEditorButton.prop('disabled', 'disabled');
             } else if (this.$wysiwygEditorButton) {
-                this.$wysiwygEditorButton.removeProp('disabled');
+                this.$wysiwygEditorButton.prop('disabled', false);
             }
 
             /* eslint-disable no-undef */

dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php

@@ -16,6 +16,7 @@ class Amqp
     const CONFIG_PATH_HOST = 'queue/amqp/host';
     const CONFIG_PATH_USER = 'queue/amqp/user';
     const CONFIG_PATH_PASSWORD = 'queue/amqp/password';
+    const DEFAULT_MANAGEMENT_PROTOCOL = 'http';
     const DEFAULT_MANAGEMENT_PORT = '15672';
 
     /**
@@ -51,7 +52,10 @@ public function __construct(
         );
         $this->curl->addHeader('content-type', 'application/json');
         $this->host = sprintf(
-            'http://%s:%s/api/',
+            '%s://%s:%s/api/',
+            defined('RABBITMQ_MANAGEMENT_PROTOCOL')
+                ? RABBITMQ_MANAGEMENT_PROTOCOL
+                : self::DEFAULT_MANAGEMENT_PROTOCOL,
             $this->deploymentConfig->get(self::CONFIG_PATH_HOST),
             defined('RABBITMQ_MANAGEMENT_PORT') ? RABBITMQ_MANAGEMENT_PORT : self::DEFAULT_MANAGEMENT_PORT
         );

dev/tests/integration/phpunit.xml.dist

@@ -80,6 +80,7 @@
         <!--<const name="MONGODB_CONNECTION_STRING" value="mongodb://localhost:27017"/>-->
         <!--<const name="MONGODB_DATABASE_NAME" value="magento_integration_tests"/>-->
         <!-- Connection parameters for RabbitMQ tests -->
+        <!--<const name="RABBITMQ_MANAGEMENT_PROTOCOL" value="https"/>-->
         <!--<const name="RABBITMQ_MANAGEMENT_PORT" value="15672"/>-->
         <!--<const name="TESTS_PARALLEL_RUN" value="1"/>-->
         <const name="USE_OVERRIDE_CONFIG" value="enabled"/>

dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc

@@ -3,6 +3,6 @@
     	"./.eslintrc-reset",
     	"./.eslintrc-magento",
     	"./.eslintrc-jquery",
-    	"./.eslintrc-tinymce"
+    	"./.eslintrc-misc"
     ]
 }

dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc-tinymce renamed to dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc-misc

@@ -78,6 +78,10 @@
                 message: "'mobile' theme is removed. Update code to be compatible with tinymce5",
                 selector: "ObjectExpression > Property[key.name='theme'][value.value='mobile']"
             },
+            {
+                message: "This method should not be used to remove built-in (native) properties",
+                selector: "CallExpression[callee.property.name='removeProp'] > :matches([arguments] Literal[value='disabled'], Literal[value='checked'], Literal[value='selected'], Literal[value='required'], Literal[value='value'], Literal[value='readOnly'])"
+            }
         ]
     }
 }

lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter.js

@@ -644,7 +644,7 @@ define([
             }
 
             if (enabled) {
-                this.getTextArea().removeProp('disabled');
+                this.getTextArea().prop('disabled', false);
             } else {
                 this.getTextArea().prop('disabled', 'disabled');
             }