Cover changes with mftf tests

Author: Nazar65

app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCloseMediaGalleryActionGroup.xml

@@ -0,0 +1,18 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCloseMediaGalleryActionGroup">
+        <annotations>
+            <description>Validates that the Media Gallery 'Cancel' buttons are present, and click on it</description>
+        </annotations>
+        <see selector="{{MediaGallerySection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn"/>
+        <click selector="{{MediaGallerySection.CancelBtn}}" stepKey="clickCancel"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenMediaGalleryTinyMce4ActionGroup.xml

@@ -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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminOpenMediaGalleryTinyMce4ActionGroup">
+        <annotations>
+            <description>Opens MediaGallery by tyniMce4 image icon</description>
+        </annotations>
+        
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
+        <click selector="{{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <click selector="{{MediaGallerySection.Browse}}" stepKey="clickBrowse"/>
+        <waitForPageLoad stepKey="waitForPopup"/>
+    </actionGroup>
+</actionGroups>

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

@@ -34,6 +34,7 @@
         <element name="WysiwygArrow" type="button" selector="#d3lzaXd5Zw-- &gt; .jstree-icon"/>
         <element name="checkIfWysiwygArrowExpand" type="button" selector="//li[@id='d3lzaXd5Zw--' and contains(@class,'jstree-closed')]"/>
         <element name="confirmDelete" type="button" selector=".action-primary.action-accept"/>
+        <element name="higlightedFolder" type="block" selector="//li[@id='{{folderId}}']/a[@class='jstree-clicked']" parameterized="true"/>
         <element name="imageBlockByName" type="block" selector="//div[@data-row='file'][contains(., '{{imageName}}')]" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Cms/Test/Mftf/Test/AdminVerifyDefaultCurrentTreePathTest.xml

@@ -0,0 +1,35 @@
+<?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="AdminVerifyDefaultCurrentTreePathTest">
+        <annotations>
+            <features value="Cms"/>
+            <group value="Cms"/>
+             <stories value="CMS Block Creation and Reset Removal"/>
+            <title value="Admin should be see preselcted default folder in Media Gallery"/>
+            <description value="Admin should be see preselcted default folder in Media Gallery"/>
+        </annotations>        
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+	<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
+        <!-- Verify catalog/category folder selected -->
+        <waitForPageLoad stepKey="waitForFoldersLoad"/>
+        <seeElement selector="{{MediaGallerySection.higlightedFolder('Y2F0YWxvZy9jYXRlZ29yeQ--')}}" stepKey="assertCategoryFolder"/>
+        <actionGroup ref="AdminCloseMediaGalleryActionGroup" stepKey="closeMEdiaGallery"/>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="opneMediaGalleryFromTinyMce4"/>
+         <!-- Verify wysiwyg folder selected -->
+        <seeElement selector="{{MediaGallerySection.higlightedFolder('d3lzaXd5Zw--')}}" stepKey="assertWysiwygFolder"/>
+    </test>
+</tests>

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

@@ -78,6 +78,7 @@ define([
             var path = this.options.currentPath,
                 tree = this.element,
                 lastExistentFolderEl,
+                pathId,
 
                 /**
                  * Recursively open folders specified in path array.
@@ -104,9 +105,10 @@ define([
                 };
 
             $(window).on('reload.MediaGallery', function () {
+                pathId =  window.MediabrowserUtility.pathId.replace(',,', '--');
                 tree.jstree('deselect_all');
-                tree.jstree('open_node', $('[data-id="' + window.MediabrowserUtility.pathId.replace(',,', '--') + '"]'), function () {
-                    tree.jstree('select_node',  $('[data-id="' + window.MediabrowserUtility.pathId.replace(',,', '--') + '"]'));
+                tree.jstree('open_node', $('[data-id="' + pathId + '"]'), function () {
+                    tree.jstree('select_node',  $('[data-id="' + pathId + '"]'));
                 });
             });