Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-68802-Clicking-Empty-Toggle

# Conflicts:
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductCustomizableOptionsSection.xml
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml

Author: Joan He

README.md

@@ -58,7 +58,7 @@ To learn more about issue gate labels click [here](https://github.com/magento/ma
 
 <h2>Reporting security issues</h2>
 
-To report security vulnerabilities in Magento software or web sites, please e-mail <a href="mailto:[email protected]">[email protected]</a>. Please do not report security issues using GitHub. Be sure to encrypt your e-mail with our <a href="https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc">encryption key</a> if it includes sensitive information. Learn more about reporting security issues <a href="https://magento.com/security/reporting-magento-security-issue">here</a>.
+To report security vulnerabilities in Magento software or web sites, please create a Bugcrowd researcher account <a href="https://bugcrowd.com/magento">there</a> to submit and follow-up your issue. Learn more about reporting security issues <a href="https://magento.com/security/reporting-magento-security-issue">here</a>.
 
 Stay up-to-date on the latest security news and patches for Magento by signing up for <a href="https://magento.com/security/sign-up">Security Alert Notifications</a>.
 

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/LICENSE.txt renamed to app/code/Magento/AdminNotification/Test/Mftf/LICENSE.txt

@@ -0,0 +1,3 @@
+# Admin Notification Functional Tests
+
+The Functional Test Module for **Magento Admin Notification** module.

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/LICENSE_AFL.txt renamed to app/code/Magento/AdminNotification/Test/Mftf/LICENSE_AFL.txt

@@ -0,0 +1,20 @@
+{
+    "name": "magento/functional-test-module-admin-notification",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/magento2-functional-testing-framework": "2.2.0",
+        "magento/functional-test-module-backend": "100.0.0-dev",
+        "magento/functional-test-module-media-storage": "100.0.0-dev",
+        "magento/functional-test-module-store": "100.0.0-dev",
+        "magento/functional-test-module-ui": "100.0.0-dev"
+    },
+    "type": "magento2-test",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ]
+}

app/code/Magento/AdminNotification/Test/Mftf/README.md

@@ -62,6 +62,9 @@ public function testGetIdentity($expectedSum, $cacheTypes)
         $this->assertEquals($expectedSum, $this->_messageModel->getIdentity());
     }
 
+    /**
+     * @return array
+     */
     public function getIdentityDataProvider()
     {
         $cacheTypeMock1 = $this->createPartialMock(\stdClass::class, ['getCacheType']);
@@ -95,6 +98,9 @@ public function testIsDisplayed($expected, $allowed, $cacheTypes)
         $this->assertEquals($expected, $this->_messageModel->isDisplayed());
     }
 
+    /**
+     * @return array
+     */
     public function isDisplayedDataProvider()
     {
         $cacheTypesMock = $this->createPartialMock(\stdClass::class, ['getCacheType']);

app/code/Magento/AdminNotification/Test/Mftf/composer.json

@@ -72,6 +72,9 @@ public function testIsDisplayed($expectedFirstRun, $data)
         $this->assertEquals($expectedFirstRun, $model->isDisplayed());
     }
 
+    /**
+     * @return array
+     */
     public function isDisplayedDataProvider()
     {
         return [

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php

@@ -76,6 +76,9 @@ public function testIsDisplayed($expectedResult, $cached, $response)
         $this->assertEquals($expectedResult, $this->_messageModel->isDisplayed());
     }
 
+    /**
+     * @return array
+     */
     public function isDisplayedDataProvider()
     {
         return [

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php

@@ -23,7 +23,7 @@
     {
         "[data-role=system_messages_list]": {
             "Magento_AdminNotification/js/system/messages/popup": {
-                class: 'modal-system-messages ui-popup-message'
+                "class":"modal-system-messages ui-popup-message"
             }
         }
     }

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php

@@ -1,24 +1,26 @@
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
-*/
+ */
 
 define([
     'jquery',
     'Magento_Ui/js/modal/modal'
-], function ($) {
+], function ($, modal) {
     'use strict';
 
     return function (data, element) {
-        if (this.modal) {
-            this.modal.html($(element).html());
+
+        if (modal.modal) {
+            modal.modal.html($(element).html());
         } else {
-            this.modal = $(element).modal({
+            modal.modal = $(element).modal({
                 modalClass: data.class,
                 type: 'popup',
                 buttons: []
             });
         }
-        this.modal.modal('openModal');
+
+        modal.modal.modal('openModal');
     };
 });