Merge branch 'B2B-2126' of https://github.com/magento-arcticfoxes/magento2ce into af-prs-develop

Author: rganin

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

@@ -13,7 +13,10 @@
             <description>Clicks on the Browse button in the 'Insert/edit image' model.</description>
         </annotations>
 
+        <waitForElementVisible selector="{{MediaGallerySection.Browse}}" stepKey="waitForBrowseButton"/>
         <click selector="{{MediaGallerySection.Browse}}" stepKey="clickBrowse"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <waitForElementVisible selector="{{MediaGallerySection.mediaGalleryModal}}" stepKey="waitForMediaGallery"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
     </actionGroup>
 </actionGroups>

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

@@ -13,6 +13,7 @@
             <description>Clicks on the 'Insert/edit image' TinyMCE button.</description>
         </annotations>
 
+        <waitForElementVisible selector="{{TinyMCESection.InsertImageIcon}}" stepKey="waitForInsertImageBtn" />
         <click selector="{{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageBtn" />
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>

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

@@ -21,14 +21,14 @@
         <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
         <conditionalClick selector="{{BlockPageActionsSection.idColumn}}" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="clickToAttemptSortByIdDescending" visible="true"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForFirstIdSortDescendingToFinish"/>
+        <waitForPageLoad stepKey="waitForFirstIdSortDescendingToFinish"/>
 
         <!-- Conditional Click again in case it goes from default state to ascending on first click  -->
         <conditionalClick selector="{{BlockPageActionsSection.idColumn}}" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="secondClickToAttemptSortByIdDescending" visible="true"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish"/>
+        <waitForPageLoad stepKey="waitForSecondIdSortDescendingToFinish"/>
         <click selector="{{BlockPageActionsSection.select(CMSBlockPage.identifier)}}" stepKey="clickSelectCreatedCMSBlock"/>
         <click selector="{{BlockPageActionsSection.edit(CMSBlockPage.identifier)}}" stepKey="navigateToCreatedCMSBlock"/>
         <waitForPageLoad stepKey="waitForPageLoad3"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskOfStagingSection"/>
+        <waitForPageLoad stepKey="waitForLoadingMaskOfStagingSection"/>
     </actionGroup>
 </actionGroups>

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

@@ -39,5 +39,6 @@
         <element name="insertEditImageModalWindow" type="block" selector=".mce-floatpanel.mce-window[aria-label='Insert/edit image']"/>
         <element name="mediaGalleryFolderTreeIconCollapsed" type="button" parameterized="true" selector="//li[a[text()='{{folderName}}' and @aria-expanded='false']]/i"/>
         <element name="mediaGalleryFolderTreeIconExpanded" type="button" parameterized="true" selector="//li[a[text()='{{folderName}}' and @aria-expanded='true']]/i"/>
+        <element name="mediaGalleryModal" type="block" selector="//aside[contains(@class,'_show')]//div[@class='media-gallery-container' or @class='media-gallery-modal']"/>
     </section>
 </sections>

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

@@ -69,13 +69,15 @@
         <actionGroup ref="SaveImageActionGroup" stepKey="insertImage"/>
         <actionGroup ref="AdminMediaGalleryClickOkButtonTinyMceActionGroup" stepKey="clickOk"/>
         <click selector="{{TinyMCESection.ShowHideBtn}}" stepKey="clickShowHideBtnFirstTime"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
         <click selector="{{TinyMCESection.ShowHideBtn}}" stepKey="clickShowHideBtnSecondTime"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <!--Switch to content frame and click on image-->
         <comment userInput="Switch to content frame and click on image" stepKey="commentSwitchToIframe"/>
         <switchToIFrame selector="{{TinyMCESection.EditAreaIframe}}" stepKey="switchToContentFrame"/>
         <click selector="{{TinyMCESection.IframeContent}} {{BlockContentSection.image}}" stepKey="clickImage"/>
         <switchToIFrame stepKey="switchBack"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
         <!--Add image second time and assert-->
         <comment userInput="Add image second time and assert" stepKey="commentAddImageAndAssert"/>
         <comment userInput="BIC workaround" stepKey="addImageSecondTime"/>