#436: Cannot Drag and Drop Image to Upload Area in Banner, Slide in Safari, IE11 - Fixed Tests after CR

Author: hannahnida

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AddInvalidFileToStageActionGroup.xml

@@ -12,6 +12,7 @@
             <description>Adds invalid file to Content Type and checks validation message</description>
         </annotations>
         <arguments>
+            <argument name="contentType" defaultValue="PageBuilderImageContentType"/>
             <argument name="file" defaultValue="PageBuilderImage_InvalidFileType"/>
             <argument name="section" defaultValue="ImageOnStageWithoutImageUploaded"/>
             <argument name="sectionArea" defaultValue="ImageOnStageWithoutImageUploaded.base('1')" />
@@ -20,11 +21,14 @@
             <argument name="fileSource" defaultValue=""/>
         </arguments>
         <waitForElementVisible selector="{{sectionArea}}" stepKey="waitForSectionArea"/>
-        <moveMouseOver selector="{{sectionArea}}" stepKey="hoverSectionArea"/>
-        <attachFile userInput="{{file.value}}" selector="{{attachInput}}" stepKey="attachFile"/>
+        <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusContentArea"/>
+        <moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, '1')}}" stepKey="hoverSectionArea"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeElement selector="{{PageBuilderStage.onHoverUploadImageButton(contentType.role, '1')}}" stepKey="seeUploadImageButton"/>
+        <attachFile userInput="{{file.value}}" selector="{{attachInput}}" stepKey="attachFile"/>
+        <waitForPageLoad stepKey="waitForFileLoad"/>
         <waitForElementVisible selector="{{PageBuilderStage.modal}}" stepKey="waitForModal"/>
-        <waitForElementVisible selector="{{PageBuilderStage.errorModal(file.errorMessage)}}" stepKey="waitForModalMessage"/>
+        <waitForElementVisible selector="{{PageBuilderStage.errorModalMessage(file.errorMessage)}}" stepKey="waitForModalMessage"/>
         <waitForElementVisible selector="{{PageBuilderStage.modalOk}}" stepKey="waitForModalOkButton"/>
         <click selector="{{PageBuilderStage.modalOk}}" stepKey="clickModalOkButton"/>
         <waitForElementNotVisible selector="{{PageBuilderStage.modal}}" stepKey="waitForModalGone"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderStageSection.xml

@@ -26,6 +26,7 @@
         <!-- It's safer to click the label, as Selenium will complain if it's not clicking the exact element -->
         <element name="modalDoNotShowThisAgain" type="input" selector="aside.modal-popup._show input[name='modal-dnsa'] + label"/>
         <element name="errorModal" type="button" selector="//div[@class='modal-content']//div[contains(text(), '{{arg1}}')]" parameterized="true"/>
+        <element name="errorModalMessage" type="text" selector="//aside[contains(@class,'modal-popup')]//div[@class='modal-content']//div[.=&quot;{{arg1}}&quot;]" parameterized="true"/>
         <element name="dropZone" type="button" selector="(//div[contains(@class, &quot;{{arg1}}-container&quot;)])[{{arg2}}]//div[contains(@class,&quot;pagebuilder-drop-indicator&quot;)][{{arg3}}]" parameterized="true"/>
         <element name="contentTypeTotalInStage" type="button" selector=".pagebuilder-content-type.pagebuilder-{{arg1}}" parameterized="true"/>
         <element name="contentTypeInStage" type="button" selector="//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(@class, &quot;pagebuilder-{{arg1}}&quot;)]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerBackgroundImageInvalidFileTypeValidationTest.xml

@@ -25,6 +25,7 @@
             <argument name="contentType" value="PageBuilderBannerContentType"/>
         </actionGroup>
         <actionGroup ref="AddInvalidFileToStage" stepKey="AddInvalidFileToStage">
+            <argument name="contentType" value="PageBuilderBannerContentType"/>
             <argument name="section" value="BannerOnBackend"/>
             <argument name="sectionArea" value="BannerOnBackend.base('1')"/>
             <argument name="attachInput" value="BannerOnBackend.uploadImageInput"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBackgroundImageInvalidFileTypeValidationTest.xml

@@ -25,8 +25,9 @@
             <argument name="contentType" value="PageBuilderSliderContentType"/>
         </actionGroup>
         <actionGroup ref="AddInvalidFileToStage" stepKey="AddInvalidFileToStage">
+            <argument name="contentType" value="PageBuilderSliderContentType"/>
             <argument name="section" value="SlideOnBackend"/>
-            <argument name="sectionArea" value="SlideOnBackend.base('1')"/>
+            <argument name="sectionArea" value="SlideOnBackend.all"/>
             <argument name="attachInput" value="SlideOnBackend.uploadImageInput"/>
             <argument name="filePreview" value="SlideOnBackend.backgroundImage('1', PageBuilderImage_InvalidFileType.fileName)"/>
             <argument name="fileSource" value="SlideOnBackend.imageSourceByIndex('1', PageBuilderImage_InvalidFileType.fileName)"/>