MC-18709: [WYSIWYG]Spinner is Always Displayed on Media Gallery popup

- Updated automated test script

Author: Lusine-Papyan

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

@@ -11,18 +11,16 @@
         <arguments>
             <argument name="image" type="entity" defaultValue="MagentoLogo"/>
         </arguments>
-        <click selector="{{BlockContentItemsSection.addImageButton}}" stepKey="clickAddImageButton"/>
-        <waitForElementVisible selector="{{BlockInsertOrEditImageSection.browseImage}}" stepKey="waitForBrowseImage"/>
-        <click  selector="{{BlockInsertOrEditImageSection.browseImage}}" stepKey="clickBrowseImage"/>
-        <waitForElementVisible selector="{{BlockSelectImageSection.treeRoot}}" stepKey="waitForAttacheFiles"/>
-        <click  selector="{{BlockSelectImageSection.treeRoot}}" stepKey="clickRoot"/>
+        <click selector="{{TinyMCESection.InsertImage}}" stepKey="clickAddImageButton"/>
+        <waitForElementVisible selector="{{MediaGallerySection.Browse}}" stepKey="waitForBrowseImage"/>
+        <click  selector="{{MediaGallerySection.Browse}}" stepKey="clickBrowseImage"/>
+        <waitForElementVisible selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="waitForAttacheFiles"/>
+        <click  selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickRoot"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <attachFile selector="{{BlockSelectImageSection.uploadFile}}" userInput="{{image.file}}" stepKey="attachLogo"/>
-        <waitForElementVisible selector="{{BlockSelectImageSection.addSelected}}" stepKey="waitForAddSelected"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear2"/>
-        <click  selector="{{BlockSelectImageSection.addSelected}}" stepKey="clickAddSelected"/>
-        <waitForElementVisible selector="{{BlockInsertOrEditImageSection.ok}}" stepKey="waitForOkButton"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-        <click  selector="{{BlockInsertOrEditImageSection.ok}}" stepKey="clickOk"/>
+        <attachFile selector="{{MediaGallerySection.BrowseUploadImage}}" userInput="{{image.file}}" stepKey="attachLogo"/>
+        <waitForElementVisible selector="{{MediaGallerySection.InsertFile}}" stepKey="waitForAddSelected"/>
+        <click  selector="{{MediaGallerySection.InsertFile}}" stepKey="clickAddSelected"/>
+        <waitForElementVisible selector="{{MediaGallerySection.OkBtn}}" stepKey="waitForOkButton"/>
+        <click  selector="{{MediaGallerySection.OkBtn}}" stepKey="clickOk"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml

@@ -24,23 +24,11 @@
     </section>
     <section name="BlockContentSection">
         <element name="TextArea" type="input" selector="#cms_block_form_content"/>
-        <element name="image" type="file" selector="//*[contains(@class, 'mce-content-body')]//img"/>
+        <element name="image" type="file" selector="#tinymce img"/>
         <element name="contentIframe" type="iframe" selector="cms_block_form_content_ifr"/>
     </section>
     <section name="CmsBlockBlockActionSection">
         <element name="deleteBlock" type="button" selector="#delete" timeout="30"/>
         <element name="deleteConfirm" type="button" selector=".action-primary.action-accept" timeout="60"/>
     </section>
-    <section name="BlockContentItemsSection">
-        <element name="addImageButton" type="button" selector="//div[contains(@class, 'mce-widget')]//i[contains(@class, 'mce-i-image')]"/>
-    </section>
-    <section name="BlockInsertOrEditImageSection">
-        <element name="browseImage" type="button" selector="//div[contains(@class, 'mce-floatpanel')]//i[contains(@class, 'mce-i-browse')]"/>
-        <element name="ok" type="button" selector="//div[contains(@class, 'mce-floatpanel')]//span[contains(text(), 'Ok')]"/>
-    </section>
-    <section name="BlockSelectImageSection">
-        <element name="uploadFile" type="input" selector="input.fileupload"/>
-        <element name="addSelected" type="button" selector="#insert_files"/>
-        <element name="treeRoot" type="text" selector="#root"/>
-    </section>
 </sections>