Skip to content

Commit c76e8ad

Browse files
committed
MC-3053: Automate MFTF for MC-2294
1 parent 9531346 commit c76e8ad

File tree

7 files changed

+36
-21
lines changed

7 files changed

+36
-21
lines changed

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDynamicBlockActionGroup.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,4 @@
2929
<fillField selector="{{AdminBannerBasicActionSection.Name}}" userInput="{{Banner.Name}}" stepKey="fillBannerName"/>
3030
<conditionalClick selector="{{AdminBannerBasicActionSection.ContentTab}}" dependentSelector="{{BannerContentSection.checkIfContentTabOpen}}" stepKey="clickIfContentTabCloses" visible="true"/>
3131
</actionGroup>
32-
<actionGroup name="uploadImageToContentTypeFromStage">
33-
<arguments>
34-
<argument name="property"/>
35-
</arguments>
36-
<attachFile userInput="{{property.value}}" selector="{{PageBuilderStage.uploadLocalImageBtn}}" stepKey="attachImageFromLocalToStage"/>
37-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
38-
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(property.fileName)}}" stepKey="waitForMainImageSource1"/>
39-
</actionGroup>
4032
</actionGroups>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,12 @@
7070
<click selector="{{section.selectFromGalleryImageBtn}}" stepKey="clickSelectFromGalleryBtn1" />
7171
<waitForPageLoad stepKey="waitForPageLoad"/>
7272
</actionGroup>
73+
<actionGroup name="uploadImageToContentTypeFromStage">
74+
<arguments>
75+
<argument name="property"/>
76+
</arguments>
77+
<attachFile userInput="{{property.value}}" selector="{{PageBuilderStage.uploadLocalImageBtn}}" stepKey="attachImageFromLocalToStage"/>
78+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
79+
<waitForElementVisible selector="{{PageBuilderStage.imageSource(property.fileName)}}" stepKey="waitForMainImageSource1"/>
80+
</actionGroup>
7381
</actionGroups>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@
7575
<element name="emptyBanner" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]//div[contains(@class,'pagebuilder-empty-banner') and .='Edit Banner Text']" parameterized="true"/>
7676
<element name="editableButtonOnStage" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]//button//span[@contenteditable='true']" parameterized="true"/>
7777
<element name="wysiwygLinkUrl" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]//a[@href='{{arg2}}']" parameterized="true"/>
78+
<element name="selectFromGalleryImageBtn" type="button" selector="//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']"/>
79+
<element name="imageOnStage" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]//img[contains(@src,'{{var1}}')]" parameterized="true"/>
7880
<!-- Appearance Configuration -->
7981
<element name="appearance" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
8082
<element name="posterMinimumHeight" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="PageBuilderStage">
12+
<element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
1213
<element name="openFullScreen" type="button" selector="//i[@class='icon-pagebuilder-fullscreen']"/>
1314
<element name="exitFullScreen" type="button" selector=".pagebuilder-header .action-close"/>
1415
<element name="stageLoading" type="button" selector="div.pagebuilder-stage-loading"/>

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,17 +1938,18 @@
19381938
<comment userInput="Go to Media Storage from stage" stepKey="commentGoToMediaStorageFromStage1"/>
19391939
<actionGroup ref="goToMediaStorageFromStage" stepKey="goToMediaStorageFromStage1" >
19401940
<argument name="contentType" value="PageBuilderBannerContentType"/>
1941-
<argument name="section" value="ImageOnStage"/>
1941+
<argument name="section" value="BannerOnBackend"/>
19421942
</actionGroup>
19431943
<!-- Delete image A -->
19441944
<comment stepKey="deleteImageA" userInput="Delete image A"/>
19451945
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
19461946
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
19471947
</actionGroup>
19481948
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut1"/>
1949+
<!-- Assert not to see deleted image on stage -->
19491950
<comment userInput="Assert not to see deleted image on stage" stepKey="assertNotToSeeImage1"/>
19501951
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="seeBannerPlaceholder1"/>
1951-
<dontSeeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderBackgroundImage_JPG.fileName)}}" stepKey="dontSeeImageInDOM1"/>
1952+
<dontSeeElementInDOM selector="{{BannerOnBackend.imageOnStage('1',PageBuilderBackgroundImage_JPG.fileName)}}" stepKey="dontSeeImageInDOM1"/>
19521953
<!-- Attach image C to Image slideout form -->
19531954
<comment userInput="Attach image C to Image slideout form" stepKey="attachImageToSlideOut"/>
19541955
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
@@ -1968,10 +1969,13 @@
19681969
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage3">
19691970
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
19701971
</actionGroup>
1971-
<!--<conditionalClick selector=".modals-overlay" dependentSelector=".modals-overlay" stepKey="clickOverlay" visible="true"/>-->
1972-
<dontSeeElementInDOM selector="{{EditPanelForm.editFormUploadedImageSource(PageBuilderBackgroundImage_JPG.section, PageBuilderBackgroundImage_JPG.fieldName, PageBuilderBackgroundImage_JPG.fileName, PageBuilderBackgroundImage_JPG.extension)}}" stepKey="dontSeeImage"/>
1972+
<actionGroup ref="seeNoImageUploadedOnSlideOut" stepKey="validateNoBackgroundImage">
1973+
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
1974+
</actionGroup>
19731975
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
1976+
<!-- Verify image is removed from Banner stage -->
1977+
<comment userInput="Verify image is removed from Banner stage" stepKey="commentVerifyBannerStage"/>
19741978
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="seeBannerPlaceholder2"/>
1975-
<dontSeeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderBackgroundImage_JPG.fileName)}}" stepKey="dontSeeImageInDOM2"/>
1979+
<dontSeeElementInDOM selector="{{BannerOnBackend.imageOnStage('1',PageBuilderBackgroundImage_JPG.fileName)}}" stepKey="dontSeeImageInDOM2"/>
19761980
</test>
19771981
</tests>

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</actionGroup>
4343
<!-- Attach image A to PageBuilder stage -->
4444
<comment userInput="Attach image A to PageBuilder stage" stepKey="attachImageToStage"/>
45-
<actionGroup ref="addImageToStage" stepKey="addImageToStage">
45+
<actionGroup ref="uploadImageToContentTypeFromStage" stepKey="addImageToStage">
4646
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
4747
</actionGroup>
4848
<!-- Go to Media Storage from stage-->
@@ -59,7 +59,7 @@
5959
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut1"/>
6060
<!-- Assert don't see deleted image on stage -->
6161
<comment userInput="Assert don't see deleted image on stage" stepKey="assertNotToSeeImage"/>
62-
<seeElementInDOM selector="{{ImageOnStage.imageEmptyPreview}}" stepKey="dontSeeImageOnStage1"/>
62+
<seeElement selector="{{ImageOnStage.imageEmptyPreview}}" stepKey="dontSeeImageOnStage1"/>
6363
<dontSeeElementInDOM selector="{{ImageOnStage.imageSourceOnStage(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="dontSeeImageInDOM1"/>
6464
<!-- Attach image C to Image slideout form -->
6565
<comment userInput="Attach image C to Image slideout form" stepKey="attachImageToSlideOut"/>
@@ -81,7 +81,9 @@
8181
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
8282
</actionGroup>
8383
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut3"/>
84-
<dontSeeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="dontSeeMainImageSource"/>
84+
<actionGroup ref="seeNoImageUploadedOnSlideOut" stepKey="validateNoImage">
85+
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
86+
</actionGroup>
8587
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
8688
<seeElementInDOM selector="{{ImageOnStage.imageEmptyPreview}}" stepKey="dontSeeImageOnStage2"/>
8789
<!-- Attach image B to Image slideout form from Media Storage -->
@@ -95,7 +97,7 @@
9597
<argument name="ImageFolder" value="ImageFolder"/>
9698
</actionGroup>
9799
<actionGroup ref="attachImage" stepKey="SelectImageFromMediaStorage">
98-
<argument name="Image" value="PageBuilderImageProperty_JPG2"/>
100+
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
99101
</actionGroup>
100102
<actionGroup ref="saveImage" stepKey="saveImage"/>
101103
<actionGroup ref="verifyImageOnSlideout" stepKey="verifyImageOnSlideout2">
@@ -109,8 +111,12 @@
109111
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage4">
110112
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
111113
</actionGroup>
112-
<dontSeeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="dontSeeMainImageSource2"/>
114+
<actionGroup ref="seeNoImageUploadedOnSlideOut" stepKey="validateNoImage1">
115+
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
116+
</actionGroup>
113117
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
118+
<!-- Assert not to see image on stage -->
119+
<comment userInput="Assert not to see image on stage" stepKey="commentVerifyImageStage" />
114120
<seeElementInDOM selector="{{ImageOnStage.imageEmptyPreview}}" stepKey="dontSeeImageOnStage3"/>
115121
<dontSeeElementInDOM selector="{{ImageOnStage.imageSourceOnStage(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="dontSeeImageInDOM2"/>
116122
</test>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideCommonTest.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1901,8 +1901,9 @@
19011901
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachSlideImageFile1">
19021902
<argument name="property" value="PageBuilderSlideBackgroundImageProperty1"/>
19031903
</actionGroup>
1904-
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageName(PageBuilderSlideBackgroundImageProperty1.value)}}" stepKey="waitForUploadImage1" />
1905-
<seeElement selector="{{ImageOnConfigurationPanel.imageName(PageBuilderSlideBackgroundImageProperty1.value)}}" stepKey="seeImageNameOnPreview1"/>
1904+
<actionGroup ref="seeImageUploadedOnSlideOut" stepKey="seeImageOnSlideOut1">
1905+
<argument name="property" value="PageBuilderSlideBackgroundImageProperty1"/>
1906+
</actionGroup>
19061907
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut1">
19071908
<argument name="property" value="PageBuilderSlideBackgroundImageProperty1"/>
19081909
</actionGroup>
@@ -1916,7 +1917,7 @@
19161917
<dontSeeElementInDOM selector="{{SlideOnBackend.slideBackgroundImage('0',PageBuilderSlideBackgroundImageProperty1.path, PageBuilderSlideBackgroundImageProperty1.extension)}}" stepKey="dontSeeImageNameOnPreview1"/>
19171918
<!--Upload image from local machine -->
19181919
<comment userInput="Upload image from local machine to stage" stepKey="commentUploadImageToStage"/>
1919-
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachImageFile1">
1920+
<actionGroup ref="uploadImageToContentTypeFromStage" stepKey="attachImageFile1">
19201921
<argument name="property" value="PageBuilderSlideBackgroundImageProperty1"/>
19211922
</actionGroup>
19221923
<actionGroup ref="goToMediaStorageFromStage" stepKey="goToMediaStorageFromStage1" >
@@ -1931,6 +1932,7 @@
19311932
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut1"/>
19321933
<!-- Assert not to see deleted image on stage -->
19331934
<comment userInput="Assert not to see deleted image on stage" stepKey="assertNotToSeeImage1"/>
1935+
<seeElementInDOM selector="{{SlideOnBackend.emptyslide}}" stepKey="seeEmptySliderOnStage"/>
19341936
<dontSeeElementInDOM selector="{{SlideOnBackend.slideBackgroundImage('0',PageBuilderSlideBackgroundImageProperty2.path, PageBuilderSlideBackgroundImageProperty1.extension)}}" stepKey="dontSeeImageInrMainImageSource1"/>
19351937
</test>
19361938
</tests>

0 commit comments

Comments
 (0)