Skip to content

Commit 5da7ff0

Browse files
hannahnidahannahnida
committed
#436: Cannot Drag and Drop Image to Upload Area in Banner, Slide in Safari, IE11 - Modified MFTF test for image validation message, added slider and banner action groups
1 parent e50a290 commit 5da7ff0

File tree

6 files changed

+87
-10
lines changed

6 files changed

+87
-10
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBannerActionGroup/AddInvalidBannerBackgroundToStageActionGroup.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="addInvalidBannerBackgroundToStage">
11+
<arguments>
12+
<argument name="property"/>
13+
<argument name="section" defaultValue="BannerOnBackend"/>
14+
</arguments>
15+
<comment userInput="Attach invalid Banner background to PageBuilder stage" stepKey="commentAttach"/>
16+
<moveMouseOver selector="{{section.emptyBanner('1')}}" stepKey="hoverBanner"/>
17+
<attachFile userInput="{{property.value}}" selector="{{section.uploadImageInput}}" stepKey="attachSectionBackgroundFileOnStage"/>
18+
<waitForPageLoad stepKey="waitForPageLoad"/>
19+
<waitForElementVisible selector="{{section.invalidUploadTitle}}" stepKey="waitForInvalidUploadTitle"/>
20+
<waitForElementVisible selector="{{section.invalidUploadMessage(property.errorMessage)}}" stepKey="waitForInvalidUploadMessage"/>
21+
<waitForElementVisible selector="{{section.invalidUploadOkBtn}}" stepKey="waitForInvalidUploadBtn"/>
22+
<click selector="{{section.invalidUploadOkBtn}}" stepKey="clickInvalidUploadBtn"/>
23+
<waitForElementNotVisible selector="{{ImageOnStageWithoutImageUploaded.invalidUploadTitle}}" stepKey="waitForModalGone"/>
24+
<dontSeeElementInDOM selector="{{section.imageOnStage('1', property.fileName)}}" stepKey="waitForImagePreview"/>
25+
<dontSeeElementInDOM selector="{{section.imageSourceByIndex('1', property.fileName)}}" stepKey="waitForImageSource"/>
26+
</actionGroup>
27+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AddInvalidImageToStageActionGroup.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@
1010
<actionGroup name="addInvalidImageToStage">
1111
<arguments>
1212
<argument name="property"/>
13+
<argument name="section" defaultValue="ImageOnStageWithoutImageUploaded"/>
1314
</arguments>
1415
<comment userInput="Attach invalid image A to PageBuilder stage" stepKey="commentAttach"/>
15-
<attachFile userInput="{{property.value}}" selector="{{ImageOnStageWithoutImageUploaded.attachImageBtn}}" stepKey="attachImageFileOnStage"/>
16+
<attachFile userInput="{{property.value}}" selector="{{section.attachImageBtn}}" stepKey="attachImageFileOnStage"/>
1617
<waitForPageLoad stepKey="waitForPageLoad"/>
17-
<waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.invalidUploadTitle}}" stepKey="waitForInvalidUploadTitle"/>
18-
<waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.invalidUploadMessage(property.errorMessage)}}" stepKey="waitForInvalidUploadMessage"/>
19-
<waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.invalidUploadOkBtn}}" stepKey="waitForInvalidUploadBtn"/>
20-
<click selector="{{ImageOnStageWithoutImageUploaded.invalidUploadOkBtn}}" stepKey="clickInvalidUploadBtn"/>
21-
<waitForElementNotVisible selector="{{ImageOnStageWithoutImageUploaded.invalidUploadTitle}}" stepKey="waitForModalGone"/>
22-
<dontSeeElementInDOM selector="{{ImageOnStageWithoutImageUploaded.imagePreview}}" stepKey="waitForImagePreview"/>
23-
<dontSeeElementInDOM selector="{{ImageOnStageWithoutImageUploaded.imageSource(property.fileName)}}" stepKey="waitForImageSource"/>
18+
<waitForElementVisible selector="{{section.invalidUploadTitle}}" stepKey="waitForInvalidUploadTitle"/>
19+
<waitForElementVisible selector="{{section.invalidUploadMessage(property.errorMessage)}}" stepKey="waitForInvalidUploadMessage"/>
20+
<waitForElementVisible selector="{{section.invalidUploadOkBtn}}" stepKey="waitForInvalidUploadBtn"/>
21+
<click selector="{{section.invalidUploadOkBtn}}" stepKey="clickInvalidUploadBtn"/>
22+
<waitForElementNotVisible selector="{{section.invalidUploadTitle}}" stepKey="waitForModalGone"/>
23+
<dontSeeElementInDOM selector="{{section.imagePreview}}" stepKey="waitForImagePreview"/>
24+
<dontSeeElementInDOM selector="{{section.imageSource(property.fileName)}}" stepKey="waitForImageSource"/>
2425
</actionGroup>
2526
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/AddInvalidSliderBackgroundToStageActionGroup.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="addInvalidSliderBackgroundToStage">
11+
<arguments>
12+
<argument name="property"/>
13+
<argument name="section" defaultValue="SlideOnBackend"/>
14+
</arguments>
15+
<comment userInput="Attach invalid slide background to PageBuilder stage" stepKey="commentAttach"/>
16+
<moveMouseOver selector="{{section.emptySlide('1')}}" stepKey="hoverSection"/>
17+
<attachFile userInput="{{property.value}}" selector="{{section.uploadImageInput}}" stepKey="attachSectionBackgroundFileOnStage"/>
18+
<waitForPageLoad stepKey="waitForPageLoad"/>
19+
<waitForElementVisible selector="{{section.invalidUploadTitle}}" stepKey="waitForInvalidUploadTitle"/>
20+
<waitForElementVisible selector="{{section.invalidUploadMessage(property.errorMessage)}}" stepKey="waitForInvalidUploadMessage"/>
21+
<waitForElementVisible selector="{{section.invalidUploadOkBtn}}" stepKey="waitForInvalidUploadBtn"/>
22+
<click selector="{{section.invalidUploadOkBtn}}" stepKey="clickInvalidUploadBtn"/>
23+
<waitForElementNotVisible selector="{{section.invalidUploadTitle}}" stepKey="waitForModalGone"/>
24+
<dontSeeElementInDOM selector="{{section.backgroundImage('1', property.fileName)}}" stepKey="waitForImagePreview"/>
25+
<dontSeeElementInDOM selector="{{section.imageSourceByIndex('1', property.fileName)}}" stepKey="waitForImageSource"/>
26+
</actionGroup>
27+
</actionGroups>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
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']"/>
4649
<!-- Content Configuration -->
4750
<element name="contentJS" type="text" selector="document.querySelectorAll('[data-content-type=banner] div.inline-wysiwyg')[{{contentIndex}} - 1]" parameterized="true"/>
4851
<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/PageBuilderSliderSection/SlideOnBackendSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@
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']"/>
4952
<!-- Video Background -->
5053
<element name="videoBackgroundJarallaxContainer" type="text" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@id,'jarallax-container')]"/>
5154
<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/AdminPageBuilderImageTest/ImageInvalidTypeValidationTest.xml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,26 @@
3333
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3434
<argument name="contentType" value="PageBuilderImageContentType"/>
3535
</actionGroup>
36-
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
36+
<actionGroup ref="dragContentTypeToStage" stepKey="dragImageContentTypeToStage">
3737
<argument name="contentType" value="PageBuilderImageContentType"/>
3838
</actionGroup>
39-
<actionGroup ref="addInvalidImageToStage" stepKey="addImageToStage">
39+
<actionGroup ref="addInvalidImageToStage" stepKey="addInvalidImageToStage">
40+
<argument name="property" value="PageBuilderImage_InvalidFileType"/>
41+
</actionGroup>
42+
<!-- Add Banner Background Image to Stage -->
43+
<comment userInput="Add Banner Background Image to Stage" stepKey="commentAddBannerToStage"/>
44+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerContentTypeToStage">
45+
<argument name="contentType" value="PageBuilderBannerContentType"/>
46+
</actionGroup>
47+
<actionGroup ref="addInvalidBannerBackgroundToStage" stepKey="addInvalidBannerBackgroundToStage">
48+
<argument name="property" value="PageBuilderImage_InvalidFileType"/>
49+
</actionGroup>
50+
<!-- Add Slide Background Image to Stage -->
51+
<comment userInput="Add Slide Background Image to Stage" stepKey="commentAddSliderToStage"/>
52+
<actionGroup ref="dragContentTypeToStage" stepKey="dragSliderContentTypeToStage">
53+
<argument name="contentType" value="PageBuilderSliderContentType"/>
54+
</actionGroup>
55+
<actionGroup ref="addInvalidSliderBackgroundToStage" stepKey="addInvalidSliderBackgroundToStage">
4056
<argument name="property" value="PageBuilderImage_InvalidFileType"/>
4157
</actionGroup>
4258
</test>

0 commit comments

Comments
 (0)