Skip to content

Commit a2f2620

Browse files
hannahnidahannahnida
committed
#436: Cannot Drag and Drop Image to Upload Area in Banner, Slide in Safari, IE11 - Fixed Tests after CR
1 parent 18bb96c commit a2f2620

File tree

7 files changed

+23
-42
lines changed

7 files changed

+23
-42
lines changed

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,28 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="addInvalidFileToStage">
10+
<actionGroup name="AddInvalidFileToStage">
11+
<annotations>
12+
<description>Adds invalid file to Content Type and checks validation message</description>
13+
</annotations>
1114
<arguments>
12-
<argument name="property"/>
15+
<argument name="file" defaultValue="PageBuilderImage_InvalidFileType"/>
1316
<argument name="section" defaultValue="ImageOnStageWithoutImageUploaded"/>
1417
<argument name="sectionArea" defaultValue="ImageOnStageWithoutImageUploaded.base('1')" />
1518
<argument name="attachInput" defaultValue="ImageOnStageWithoutImageUploaded.attachImageBtn" />
1619
<argument name="filePreview" defaultValue="ImageOnStageWithoutImageUploaded.imagePreview"/>
1720
<argument name="fileSource" defaultValue=""/>
1821
</arguments>
19-
<comment userInput="Attach invalid file to PageBuilder" stepKey="commentAttach"/>
22+
<waitForElementVisible selector="{{sectionArea}}" stepKey="waitForSectionArea"/>
2023
<moveMouseOver selector="{{sectionArea}}" stepKey="hoverSectionArea"/>
21-
<attachFile userInput="{{property.value}}" selector="{{attachInput}}" stepKey="attachFile"/>
24+
<attachFile userInput="{{file.value}}" selector="{{attachInput}}" stepKey="attachFile"/>
2225
<waitForPageLoad stepKey="waitForPageLoad"/>
23-
<waitForElementVisible selector="{{section.invalidUploadTitle}}" stepKey="waitForInvalidUploadTitle"/>
24-
<waitForElementVisible selector="{{section.invalidUploadMessage(property.errorMessage)}}" stepKey="waitForInvalidUploadMessage"/>
25-
<waitForElementVisible selector="{{section.invalidUploadOkBtn}}" stepKey="waitForInvalidUploadBtn"/>
26-
<click selector="{{section.invalidUploadOkBtn}}" stepKey="clickInvalidUploadBtn"/>
27-
<waitForElementNotVisible selector="{{section.invalidUploadTitle}}" stepKey="waitForModalGone"/>
28-
<dontSeeElementInDOM selector="{{filePreview}}" stepKey="waitForFilePreview"/>
29-
<dontSeeElementInDOM selector="{{fileSource}}" stepKey="waitForFileSource"/>
26+
<waitForElementVisible selector="{{PageBuilderStage.modal}}" stepKey="waitForModal"/>
27+
<waitForElementVisible selector="{{PageBuilderStage.errorModal(file.errorMessage)}}" stepKey="waitForModalMessage"/>
28+
<waitForElementVisible selector="{{PageBuilderStage.modalOk}}" stepKey="waitForModalOkButton"/>
29+
<click selector="{{PageBuilderStage.modalOk}}" stepKey="clickModalOkButton"/>
30+
<waitForElementNotVisible selector="{{PageBuilderStage.modal}}" stepKey="waitForModalGone"/>
31+
<dontSeeElementInDOM selector="{{filePreview}}" stepKey="dontSeeFilePreview"/>
32+
<dontSeeElementInDOM selector="{{fileSource}}" stepKey="dontSeeFileSource"/>
3033
</actionGroup>
3134
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@
4343
<element name="noBackgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{bannerIndex}}]//div[@data-element='wrapper'][not(contains(@style,'background-color:'))]" parameterized="true"/>
4444
<element name="backgroundImage" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{bannerIndex}}]//div[@data-element='wrapper'][contains(@style,'background-image: url(') and contains(@style,'{{backgroundImage}}')]" parameterized="true"/>
4545
<element name="noBackgroundImage" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{bannerIndex}}]//div[@data-element='wrapper'][not(contains(@style,'background-image:'))]" parameterized="true"/>
46-
<element name="invalidUploadTitle" type="text" selector="//aside[contains(@class,'modal-popup')]//header/h1[contains(.,'Attention')]"/>
47-
<element name="invalidUploadMessage" type="text" selector="//aside[contains(@class,'modal-popup')]//div[@class='modal-content']//div[.=&quot;{{arg1}}&quot;]" parameterized="true"/>
48-
<element name="invalidUploadOkBtn" type="text" selector="//aside[contains(@class,'modal-popup')]//footer//button//span[.='OK']"/>
4946
<!-- Content Configuration -->
5047
<element name="contentJS" type="text" selector="document.querySelectorAll('[data-content-type=banner] div.inline-wysiwyg')[{{contentIndex}} - 1]" parameterized="true"/>
5148
<element name="textArea" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{bannerIndex}}]//textarea[contains(@class,'inline-wysiwyg-textarea')]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStageWithoutImageUploadedSection.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
<element name="onHoverUploadImageButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//label[text()='Upload New Image']" parameterized="true"/>
2222
<element name="uploadImageBtn" type="button" selector="//div[@class='pagebuilder-image-uploader-container']//label[text()='Upload Image']"/>
2323
<element name="uploadImageInput" type="button" selector="(//div[contains(@class,'pagebuilder-image-uploader-container')])[{{arg1}}]//input[@name='image']" parameterized="true"/>
24-
<element name="invalidUploadTitle" type="text" selector="//aside[contains(@class,'modal-popup')]//header/h1[contains(.,'Attention')]"/>
25-
<element name="invalidUploadMessage" type="text" selector="//aside[contains(@class,'modal-popup')]//div[@class='modal-content']//div[.=&quot;{{arg1}}&quot;]" parameterized="true"/>
26-
<element name="invalidUploadOkBtn" type="text" selector="//aside[contains(@class,'modal-popup')]//footer//button//span[.='OK']"/>
2724
<!-- Advanced Configuration -->
2825
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]//figure[contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
2926
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]//figure[not(contains(@style,'text-align:'))]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnBackendSection.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@
4646
<element name="backgroundSize" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'background-size: {{backgroundSize}};')]" parameterized="true"/>
4747
<element name="backgroundRepeat" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'background-repeat: {{backgroundRepeat}};')]" parameterized="true"/>
4848
<element name="backgroundAttachment" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'background-attachment: {{backgroundAttachment}};')]" parameterized="true"/>
49-
<element name="invalidUploadTitle" type="text" selector="//aside[contains(@class,'modal-popup')]//header/h1[contains(.,'Attention')]"/>
50-
<element name="invalidUploadMessage" type="text" selector="//aside[contains(@class,'modal-popup')]//div[@class='modal-content']//div[.=&quot;{{arg1}}&quot;]" parameterized="true"/>
51-
<element name="invalidUploadOkBtn" type="text" selector="//aside[contains(@class,'modal-popup')]//footer//button//span[.='OK']"/>
5249
<!-- Video Background -->
5350
<element name="videoBackgroundJarallaxContainer" type="text" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@id,'jarallax-container')]"/>
5451
<element name="videoBackgroundVideoElement" type="text" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@id,'jarallax-container')]//iframe|(//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@id,'jarallax-container')]//video"/>

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,20 @@
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Banner"/>
14-
<title value="Banner Background Image - Invalid File Type"/>
14+
<title value="Banner Background Image Invalid File Type Upload Validation"/>
1515
<description value="Tests that the Background Image Validation functions as expected for invalid file type"/>
16-
<severity value="AVERAGE"/>
16+
<severity value="MAJOR"/>
1717
<group value="pagebuilder"/>
1818
<group value="pagebuilder-banner"/>
1919
<group value="pagebuilder-bannerCommon"/>
2020
</annotations>
21-
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
22-
<argument name="contentType" value="PageBuilderBannerContentType"/>
23-
</actionGroup>
2421
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
2522
<argument name="contentType" value="PageBuilderBannerContentType"/>
2623
</actionGroup>
2724
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
2825
<argument name="contentType" value="PageBuilderBannerContentType"/>
2926
</actionGroup>
30-
<actionGroup ref="addInvalidFileToStage" stepKey="addInvalidFileToStage">
31-
<argument name="property" value="PageBuilderImage_InvalidFileType"/>
27+
<actionGroup ref="AddInvalidFileToStage" stepKey="AddInvalidFileToStage">
3228
<argument name="section" value="BannerOnBackend"/>
3329
<argument name="sectionArea" value="BannerOnBackend.base('1')"/>
3430
<argument name="attachInput" value="BannerOnBackend.uploadImageInput"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageInvalidFileTypeValidationTest.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Image"/>
14-
<title value="Image Invalid File Type Validation"/>
14+
<title value="Image Invalid File Type Upload Validation"/>
1515
<description value="Tests that the Image Validation functions as expected for invalid file type"/>
16-
<severity value="AVERAGE"/>
16+
<severity value="MAJOR"/>
1717
<group value="pagebuilder"/>
1818
<group value="pagebuilder-image"/>
1919
</annotations>
@@ -25,18 +25,13 @@
2525
<after>
2626
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2727
</after>
28-
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
29-
<argument name="contentType" value="PageBuilderImageContentType"/>
30-
</actionGroup>
31-
<comment userInput="Add ContentType to Stage" stepKey="commentAddContentTypeToStage"/>
3228
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3329
<argument name="contentType" value="PageBuilderImageContentType"/>
3430
</actionGroup>
3531
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
3632
<argument name="contentType" value="PageBuilderImageContentType"/>
3733
</actionGroup>
38-
<actionGroup ref="addInvalidFileToStage" stepKey="addInvalidFileToStage">
39-
<argument name="property" value="PageBuilderImage_InvalidFileType"/>
34+
<actionGroup ref="AddInvalidFileToStage" stepKey="AddInvalidFileToStage">
4035
<argument name="fileSource" value="ImageOnStageWithoutImageUploaded.imageSource(PageBuilderImage_InvalidFileType.fileName)"/>
4136
</actionGroup>
4237
</test>

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,20 @@
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Slider"/>
14-
<title value="Slide Item Background Image - Invalid File Type"/>
14+
<title value="Slide Item Background Image Invalid File Type Upload Validation"/>
1515
<description value="Tests that the Slide Item Background Image Validation functions as expected for invalid file type"/>
16-
<severity value="AVERAGE"/>
16+
<severity value="MAJOR"/>
1717
<group value="pagebuilder"/>
1818
<group value="pagebuilder-slide"/>
1919
<group value="pagebuilder-slideItemCommon"/>
2020
</annotations>
21-
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
22-
<argument name="contentType" value="PageBuilderSliderContentType"/>
23-
</actionGroup>
2421
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
2522
<argument name="contentType" value="PageBuilderSliderContentType"/>
2623
</actionGroup>
2724
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
2825
<argument name="contentType" value="PageBuilderSliderContentType"/>
2926
</actionGroup>
30-
<actionGroup ref="addInvalidFileToStage" stepKey="addInvalidFileToStage">
31-
<argument name="property" value="PageBuilderImage_InvalidFileType"/>
27+
<actionGroup ref="AddInvalidFileToStage" stepKey="AddInvalidFileToStage">
3228
<argument name="section" value="SlideOnBackend"/>
3329
<argument name="sectionArea" value="SlideOnBackend.base('1')"/>
3430
<argument name="attachInput" value="SlideOnBackend.uploadImageInput"/>

0 commit comments

Comments
 (0)