Merge branch '2.3-develop-main' into MAGETWO-71571-link-ui-component

Author: irenelagno

app/code/Magento/Cms/view/adminhtml/web/js/folder-tree.js

@@ -77,18 +77,28 @@ define([
         treeLoaded: function () {
             var path = this.options.currentPath,
                 tree = this.element,
+                lastExistentFolderEl,
 
                 /**
-                 * Recursive open.
+                 * Recursively open folders specified in path array.
                  */
                 recursiveOpen = function () {
-                    var el = $('[data-id="' + path.pop() + '"]');
+                    var folderEl = $('[data-id="' + path.pop() + '"]');
+
+                    // if folder doesn't exist, select the last opened folder
+                    if (!folderEl.length) {
+                        tree.jstree('select_node', lastExistentFolderEl);
+
+                        return;
+                    }
+
+                    lastExistentFolderEl = folderEl;
 
                     if (path.length > 1) {
-                        tree.jstree('open_node', el, recursiveOpen);
+                        tree.jstree('open_node', folderEl, recursiveOpen);
                     } else {
-                        tree.jstree('open_node', el, function () {
-                            tree.jstree('select_node', el);
+                        tree.jstree('open_node', folderEl, function () {
+                            tree.jstree('select_node', folderEl);
                         });
                     }
                 };

dev/tests/acceptance/tests/_data/magentoStage.jpg

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="DeleteImageFromStorageActionGroup">
+        <arguments>
+            <argument name="Image" defaultValue="" />
+        </arguments>
+        <click selector="//small[contains(text(),'{{Image.value}}')]" stepKey="selectImage" />
+        <see selector="{{MediaGallerySection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn"/>
+        <click selector="{{MediaGallerySection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected" />
+        <waitForText userInput="OK" stepKey="waitForConfirm" />
+        <click selector="{{MediaGallerySection.confirmDelete}}" stepKey="confirmDelete" />
+        <waitForElementNotVisible selector="{{MediaGallerySection.image(ImageUpload.file)}}" stepKey="waitForImageDeleted" />
+        <dontSeeElement selector="{{MediaGallerySection.image(ImageUpload.file)}}" stepKey="dontSeeImage" />
+    </actionGroup>
+</actionGroups>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/DeleteImageFromStorageActionGroup.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="NavigateToMediaFolderActionGroup">
+        <arguments>
+            <argument name="FolderName" type="string" defaultValue="" />
+        </arguments>
+        <conditionalClick selector="{{MediaGallerySection.StorageRootArrow}}" dependentSelector="{{MediaGallerySection.checkIfArrowExpand}}" stepKey="clickArrowIfClosed" visible="true"/>
+        <waitForText userInput="{{FolderName}}" stepKey="waitForNewFolder" />
+        <click userInput="{{FolderName}}" stepKey="clickOnCreatedFolder" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading5" />
+    </actionGroup>
+</actionGroups>