B2B-1885: [MFTF] Update AdminScheduleImportSimpleProductsWithImagesTest to include before step to disable remote storage

 - Fixing flaky tests

Author: dhaecker

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

@@ -39,7 +39,8 @@
         <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" />
-        <waitForLoadingMaskToDisappear stepKey="waitForBrowseModal" />
+        <waitForPageLoad stepKey="waitForBrowseModal" />
+        <waitForElement selector="{{MediaGallerySection.CancelBtn}}" stepKey="waitForCancelBtn1" />
         <see selector="{{MediaGallerySection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn1" />
         <see selector="{{MediaGallerySection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn1" />
         <dontSeeElement selector="{{MediaGallerySection.InsertFile}}" stepKey="dontSeeAddSelectedBtn1" />
@@ -48,13 +49,13 @@
         <fillField selector="{{MediaGallerySection.FolderName}}" userInput="{{ImageFolder.name}}" stepKey="fillFolderName1" />
         <click selector="{{MediaGallerySection.AcceptFolderName}}" stepKey="acceptFolderName11" />
         <conditionalClick selector="{{MediaGallerySection.StorageRootArrow}}" dependentSelector="{{MediaGallerySection.checkIfArrowExpand}}" stepKey="clickStorageRootArrowIfClosed" visible="true"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForStorageRootLoadingMaskDisappear"/>
+        <waitForPageLoad stepKey="waitForStorageRootLoadingMaskDisappear"/>
         <conditionalClick selector="{{MediaGallerySection.WysiwygArrow}}" dependentSelector="{{MediaGallerySection.checkIfWysiwygArrowExpand}}" stepKey="clickWysiwygArrowIfClosed" visible="true"/>
         <waitForText userInput="{{ImageFolder.name}}" stepKey="waitForNewFolder1" />
         <click userInput="{{ImageFolder.name}}" stepKey="clickOnCreatedFolder1" />
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading4"/>
+        <waitForPageLoad stepKey="waitForLoading4"/>
         <attachFile selector="{{MediaGallerySection.BrowseUploadImage}}" userInput="{{ImageUpload1.value}}" stepKey="uploadImage1"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForFileUpload1"/>
+        <waitForPageLoad stepKey="waitForFileUpload1"/>
         <waitForElementVisible  selector="{{MediaGallerySection.image(ImageUpload1.value)}}" stepKey="waitForUploadImage1" />
         <seeElement selector="{{MediaGallerySection.imageSelected(ImageUpload1.value)}}" stepKey="seeImageSelected1" />
         <see selector="{{MediaGallerySection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn1"/>
@@ -65,9 +66,9 @@
         <dontSeeElement selector="{{MediaGallerySection.image(ImageUpload1.value)}}" stepKey="dontSeeImage1" />
         <dontSeeElement selector="{{MediaGallerySection.InsertFile}}" stepKey="dontSeeAddSelectedBtn2" />
         <click userInput="{{ImageFolder.name}}" stepKey="selectCreatedFolder1" />
-        <waitForLoadingMaskToDisappear stepKey="waitForSelectFolder"/>
+        <waitForPageLoad stepKey="waitForSelectFolder"/>
         <attachFile selector="{{MediaGallerySection.BrowseUploadImage}}" userInput="{{ImageUpload1.value}}" stepKey="uploadImage2"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForFileUpload2"/>
+        <waitForPageLoad stepKey="waitForFileUpload2"/>
         <waitForElementVisible selector="{{MediaGallerySection.image(ImageUpload1.value)}}" stepKey="waitForUploadImage2" />
         <click selector="{{MediaGallerySection.InsertFile}}" stepKey="clickInsertBtn1" />
         <waitForElementVisible selector="{{MediaGallerySection.ImageDescription}}" stepKey="waitForImageDescriptionButton1" />
@@ -77,17 +78,17 @@
         <scrollTo selector="{{ProductShortDescriptionWysiwygSection.form}} {{TinyMCESection.ShowHideBtn}}" y="-150" x="0" stepKey="scrollToTinyMCE" />
         <click selector="{{ProductShortDescriptionWysiwygSection.form}} {{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageIcon2" />
         <click selector="{{MediaGallerySection.Browse}}" stepKey="clickBrowse2" />
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading13"/>
+        <waitForPageLoad stepKey="waitForLoading13"/>
         <waitForElementVisible selector="{{MediaGallerySection.CancelBtn}}" stepKey="waitForCancelButton2"/>
         <see selector="{{MediaGallerySection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn2" />
         <waitForElementVisible selector="{{MediaGallerySection.CreateFolder}}" stepKey="waitForCreateFolderBtn2"/>
         <see selector="{{MediaGallerySection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn2" />
         <see selector="{{MediaGallerySection.FolderContainer}}" userInput="Storage Root" stepKey="seeFolderContainer" />
         <click userInput="Storage Root" stepKey="clickOnRootFolder" />
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading15"/>
+        <waitForPageLoad stepKey="waitForLoading15"/>
         <dontSeeElement selector="{{MediaGallerySection.InsertFile}}" stepKey="dontSeeAddSelectedBtn3" />
         <attachFile selector="{{MediaGallerySection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage3"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForFileUpload3"/>
+        <waitForPageLoad stepKey="waitForFileUpload3"/>
         <waitForElementVisible  selector="{{MediaGallerySection.image(ImageUpload3.value)}}" stepKey="waitForUploadImage3" />
         <waitForElement selector="{{MediaGallerySection.DeleteSelectedBtn}}" stepKey="waitForDeletebtn" />
         <see selector="{{MediaGallerySection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn2"/>
@@ -96,12 +97,12 @@
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete2" />
         <dontSeeElement selector="{{MediaGallerySection.InsertFile}}" stepKey="dontSeeAddSelectedBtn4" />
         <click userInput="{{ImageFolder.name}}" stepKey="selectCreatedFolder2" />
-        <waitForLoadingMaskToDisappear stepKey="waitForSelectFolder2"/>
+        <waitForPageLoad stepKey="waitForSelectFolder2"/>
         <attachFile selector="{{MediaGallerySection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage4"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForFileUpload4"/>
+        <waitForPageLoad stepKey="waitForFileUpload4"/>
         <waitForElementVisible selector="{{MediaGallerySection.image(ImageUpload3.value)}}" stepKey="waitForUploadImage4" />
         <click selector="{{MediaGallerySection.InsertFile}}" stepKey="clickInsertBtn" />
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading11" />
+        <waitForPageLoad stepKey="waitForLoading11" />
         <waitForElementVisible selector="{{MediaGallerySection.OkBtn}}" stepKey="waitForOkBtn2" />
         <fillField selector="{{MediaGallerySection.ImageDescription}}" userInput="{{ImageUpload3.content}}" stepKey="fillImageDescription2" />
         <fillField selector="{{MediaGallerySection.Height}}" userInput="{{ImageUpload3.height}}" stepKey="fillImageHeight2" />