Skip to content

Commit be344b7

Browse files
hannahnidahannahnida
committed
#436: Cannot Drag and Drop Image to Upload Area in Banner, Slide in Safari, IE11 - Added extends to tests
1 parent 28ed1ca commit be344b7

File tree

6 files changed

+20
-60
lines changed

6 files changed

+20
-60
lines changed

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AddInvalidImageToStageActionGroup.xml renamed to ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AddInvalidFileToStageActionGroup.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
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="addInvalidImageToStage">
10+
<actionGroup name="addInvalidFileToStage">
1111
<arguments>
1212
<argument name="property"/>
1313
<argument name="section" defaultValue="ImageOnStageWithoutImageUploaded"/>
1414
<argument name="sectionArea" defaultValue="ImageOnStageWithoutImageUploaded.base('1')" />
1515
<argument name="attachInput" defaultValue="ImageOnStageWithoutImageUploaded.attachImageBtn" />
16-
<argument name="imagePreview" defaultValue="ImageOnStageWithoutImageUploaded.imagePreview"/>
17-
<argument name="imageSource" defaultValue=""/>
16+
<argument name="filePreview" defaultValue="ImageOnStageWithoutImageUploaded.imagePreview"/>
17+
<argument name="fileSource" defaultValue=""/>
1818
</arguments>
19-
<comment userInput="Attach invalid image or background to PageBuilder" stepKey="commentAttach"/>
19+
<comment userInput="Attach invalid file to PageBuilder" stepKey="commentAttach"/>
2020
<moveMouseOver selector="{{sectionArea}}" stepKey="hoverSectionArea"/>
2121
<attachFile userInput="{{property.value}}" selector="{{attachInput}}" stepKey="attachFile"/>
2222
<waitForPageLoad stepKey="waitForPageLoad"/>
@@ -25,7 +25,7 @@
2525
<waitForElementVisible selector="{{section.invalidUploadOkBtn}}" stepKey="waitForInvalidUploadBtn"/>
2626
<click selector="{{section.invalidUploadOkBtn}}" stepKey="clickInvalidUploadBtn"/>
2727
<waitForElementNotVisible selector="{{section.invalidUploadTitle}}" stepKey="waitForModalGone"/>
28-
<dontSeeElementInDOM selector="{{imagePreview}}" stepKey="waitForImagePreview"/>
29-
<dontSeeElementInDOM selector="{{imageSource}}" stepKey="waitForImageSource"/>
28+
<dontSeeElementInDOM selector="{{filePreview}}" stepKey="waitForFilePreview"/>
29+
<dontSeeElementInDOM selector="{{fileSource}}" stepKey="waitForFileSource"/>
3030
</actionGroup>
3131
</actionGroups>

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

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="BannerBackgroundImageInvalidFileTypeTest">
10+
<test name="BannerBackgroundImageInvalidFileTypeTest" extends="ImageInvalidFileTypeValidationTest">
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Banner"/>
@@ -18,31 +18,22 @@
1818
<group value="pagebuilder-banner"/>
1919
<group value="pagebuilder-bannerCommon"/>
2020
</annotations>
21-
<before>
22-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23-
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
24-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
25-
</before>
26-
<after>
27-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
28-
</after>
2921
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
3022
<argument name="contentType" value="PageBuilderBannerContentType"/>
3123
</actionGroup>
32-
<comment userInput="Add Banner Background Image to Stage" stepKey="commentAddBannerToStage"/>
3324
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3425
<argument name="contentType" value="PageBuilderBannerContentType"/>
3526
</actionGroup>
36-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerContentTypeToStage">
27+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
3728
<argument name="contentType" value="PageBuilderBannerContentType"/>
3829
</actionGroup>
39-
<actionGroup ref="addInvalidBannerBackgroundToStage" stepKey="addInvalidBannerBackgroundToStage">
30+
<actionGroup ref="addInvalidFileToStage" stepKey="addInvalidFileToStage">
4031
<argument name="property" value="PageBuilderImage_InvalidFileType"/>
4132
<argument name="section" value="BannerOnBackend"/>
4233
<argument name="sectionArea" value="BannerOnBackend.base('1')"/>
4334
<argument name="attachInput" value="BannerOnBackend.uploadImageInput"/>
44-
<argument name="imagePreview" value="BannerOnBackend.backgroundImage('1', PageBuilderImage_InvalidFileType.fileName)"/>
45-
<argument name="imageSource" value="BannerOnBackend.imageSourceByIndex('1', PageBuilderImage_InvalidFileType.fileName)"/>
35+
<argument name="filePreview" value="BannerOnBackend.backgroundImage('1', PageBuilderImage_InvalidFileType.fileName)"/>
36+
<argument name="fileSource" value="BannerOnBackend.imageSourceByIndex('1', PageBuilderImage_InvalidFileType.fileName)"/>
4637
</actionGroup>
4738
</test>
4839
</tests>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
2929
<argument name="contentType" value="PageBuilderImageContentType"/>
3030
</actionGroup>
31-
<comment userInput="Add Image to Stage" stepKey="commentAddImageToStage"/>
31+
<comment userInput="Add ContentType to Stage" stepKey="commentAddContentTypeToStage"/>
3232
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3333
<argument name="contentType" value="PageBuilderImageContentType"/>
3434
</actionGroup>
35-
<actionGroup ref="dragContentTypeToStage" stepKey="dragImageContentTypeToStage">
35+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
3636
<argument name="contentType" value="PageBuilderImageContentType"/>
3737
</actionGroup>
38-
<actionGroup ref="addInvalidImageToStage" stepKey="addInvalidImageToStage">
38+
<actionGroup ref="addInvalidFileToStage" stepKey="addInvalidFileToStage">
3939
<argument name="property" value="PageBuilderImage_InvalidFileType"/>
40-
<argument name="imageSource" value="ImageOnStageWithoutImageUploaded.imageSource(PageBuilderImage_InvalidFileType.fileName)"/>
40+
<argument name="fileSource" value="ImageOnStageWithoutImageUploaded.imageSource(PageBuilderImage_InvalidFileType.fileName)"/>
4141
</actionGroup>
4242
</test>
4343
</tests>

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

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="SlideItemBackgroundImageInvalidFileTypeValidationTest">
10+
<test name="SlideItemBackgroundImageInvalidFileTypeValidationTest" extends="ImageInvalidFileTypeValidationTest">
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Slider"/>
@@ -18,31 +18,22 @@
1818
<group value="pagebuilder-slide"/>
1919
<group value="pagebuilder-slideItemCommon"/>
2020
</annotations>
21-
<before>
22-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23-
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
24-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
25-
</before>
26-
<after>
27-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
28-
</after>
2921
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
3022
<argument name="contentType" value="PageBuilderSliderContentType"/>
3123
</actionGroup>
32-
<comment userInput="Add Slide Item Background Image to Stage" stepKey="commentAddBannerToStage"/>
3324
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3425
<argument name="contentType" value="PageBuilderSliderContentType"/>
3526
</actionGroup>
36-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerContentTypeToStage">
27+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
3728
<argument name="contentType" value="PageBuilderSliderContentType"/>
3829
</actionGroup>
39-
<actionGroup ref="addInvalidSliderBackgroundToStage" stepKey="addInvalidSliderBackgroundToStage">
30+
<actionGroup ref="addInvalidFileToStage" stepKey="addInvalidFileToStage">
4031
<argument name="property" value="PageBuilderImage_InvalidFileType"/>
4132
<argument name="section" value="SlideOnBackend"/>
4233
<argument name="sectionArea" value="SlideOnBackend.base('1')"/>
4334
<argument name="attachInput" value="SlideOnBackend.uploadImageInput"/>
44-
<argument name="imagePreview" value="SlideOnBackend.backgroundImage('1', PageBuilderImage_InvalidFileType.fileName)"/>
45-
<argument name="imageSource" value="SlideOnBackend.imageSourceByIndex('1', PageBuilderImage_InvalidFileType.fileName)"/>
35+
<argument name="filePreview" value="SlideOnBackend.backgroundImage('1', PageBuilderImage_InvalidFileType.fileName)"/>
36+
<argument name="fileSource" value="SlideOnBackend.imageSourceByIndex('1', PageBuilderImage_InvalidFileType.fileName)"/>
4637
</actionGroup>
4738
</test>
4839
</tests>

0 commit comments

Comments
 (0)