Merge remote-tracking branch '38025/file_upload_error' into community_prs_march

Author: Indrani Sonawane

app/code/Magento/Catalog/Test/Mftf/Test/AdminSeeFolderInContentSectionOfProductTest.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSeeFolderInContentSectionOfProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Check default folder is visible for any product types"/>
+            <title value="Admin should be able to see default folder is visible Simple Product in Content short description"/>
+            <description value="Admin should be able to see default folder is visible Simple Product in Content short description"/>
+            <severity value="BLOCKER"/>
+            <testCaseId value="AC-9638"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
+            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="navigateToNewProduct"/>
+        <actionGroup ref="FillMainProductFormActionGroup" stepKey="fillBasicProductInfo" />
+        <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
+        <scrollTo selector="{{ProductDescriptionWysiwygSection.form}} {{TinyMCESection.ShowHideBtn}}" y="-150" x="0" stepKey="scrollToDescription"/>
+        <waitForElementVisible selector="{{ProductDescriptionWysiwygSection.form}} {{TinyMCESection.TinyMCE}}" stepKey="waitForDescription" />
+        <scrollTo selector="{{ProductDescriptionWysiwygSection.form}} {{TinyMCESection.ShowHideBtn}}" y="-150" x="0" stepKey="scrollToDescriptionAgain"/>
+        <click selector="{{ProductDescriptionWysiwygSection.form}} {{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageIcon1" />
+        <click selector="{{MediaGallerySection.Browse}}" stepKey="clickBrowse1" />
+        <waitForPageLoad stepKey="waitForBrowseModal" />
+        <waitForElement selector="{{MediaGallerySection.CancelBtn}}" stepKey="waitForCancelBtn1" />
+        <see selector="{{MediaGallerySection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn1" />
+        <see selector="{{MediaGallerySection.UploadImageNew}}" userInput="Upload Image" stepKey="seeUploadImage" />
+        <waitForElement selector="{{MediaGallerySection.wysiwygAnchor}}" stepKey="waitForWysiwygAnchor" />
+        <see selector="{{MediaGallerySection.wysiwygAnchor}}" userInput="wysiwyg" stepKey="seeWysiwygAnchor" />
+
+    </test>
+</tests>

app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml

@@ -20,6 +20,7 @@
         <element name="ImageDescriptionTinyMCE" type="input" selector="#alt" />
         <element name="Height" type="input" selector="//label[text()='Height']/parent::div//input"/>
         <element name="UploadImage" type="file" selector=".fileupload"/>
+        <element name="UploadImageNew" type="file" selector="#upload_image"/>
         <element name="UploadImageSelector" type="file" selector="#fileUploader"/>
         <element name="UploadImageWithUploaderId" type="file" selector="#fileUploader + .uppy-Root .uppy-Dashboard-input"/>
         <element name="OkBtn" type="button" selector=".tox-dialog__footer button[title='Save']"/>
@@ -29,6 +30,7 @@
         <element name="DeleteFolder" type="button" selector="#delete_folder"/>
         <element name="DeleteSelectedBtn" type="button" selector="#delete_files" timeout="30"/>
         <element name="CancelBtn" type="button" selector="#cancel"/>
+        <element name="wysiwygAnchor" type="button" selector="#wysiwyg_anchor"/>
         <element name="FolderName" type="button" selector="input[data-role='promptField']"/>
         <element name="FolderContainer" type="button" selector="div[data-role='tree']"/>
         <element name="AcceptFolderName" type="button" selector=".action-primary.action-accept"/>

lib/web/mage/backend/tree-suggest.js

@@ -55,7 +55,8 @@ define([
         /**
          * @override
          */
-        init: function () {
+        init: function (el, options) {
+            init.call(this, el, options);
             this.get_container()
                 .show()
                 .on('keydown', $.proxy(function (e) {
@@ -66,15 +67,14 @@ define([
                         this.select_node(o, true);
                     }
                 }, this));
-            init.call(this);
         },
 
         /**
          * @override
          */
         hover_node: function (obj) {
             hover_node.apply(this, arguments);
-            obj = this._get_node(obj);
+            obj = this.get_node(obj);
 
             if (!obj.length) {
                 return false;
@@ -99,7 +99,7 @@ define([
             var node;
 
             select_node.apply(this, arguments);
-            node = this._get_node(o);
+            node = this.get_node(o);
 
             (node ? $(node) : this.data.ui.last_selected)
                 .trigger('select_tree_node');
@@ -169,14 +169,14 @@ define([
                     var keyCode = $.ui.keyCode;
 
                     switch (event.keyCode) {
-                        case keyCode.LEFT:
-                        case keyCode.RIGHT:
-
-                            if (this.isDropdownShown()) {
-                                event.preventDefault();
-                                this._proxyEvents(event);
-                            }
-                            break;
+                    case keyCode.LEFT:
+                    case keyCode.RIGHT:
+
+                        if (this.isDropdownShown()) {
+                            event.preventDefault();
+                            this._proxyEvents(event);
+                        }
+                        break;
                     }
                 }
             });
@@ -233,10 +233,10 @@ define([
                  */
                 renderTreeLevel: function (children) {
                     var _context = $.extend({}, this, {
-                        items: children,
-                        nested: true
-                    }),
-                    tmpl = templates[tmplName];
+                            items: children,
+                            nested: true
+                        }),
+                        tmpl = templates[tmplName];
 
                     tmpl = tmpl({
                         data: _context