Skip to content

Commit 0328db1

Browse files
cspruiellcspruiell
committed
MC-3348: Unskip delete image tests
 - fix tests
1 parent 7101fd3 commit 0328db1

9 files changed

+15
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<attachFile userInput="{{property.value}}" selector="{{ImageOnStage.attachImageBtn}}" stepKey="attachImageFileOnStage"/>
1616
<waitForPageLoad stepKey="waitForPageLoad"/>
1717
<waitForElementVisible selector="{{ImageOnStage.imagePreview}}" stepKey="waitForImagePreview"/>
18-
<waitForElementVisible selector="{{ImageOnStage.imageSourceOnStage(property.fileName)}}" stepKey="waitForImageSource"/>
18+
<waitForElementVisible selector="{{ImageOnStage.imageSource(property.fileName)}}" stepKey="waitForImageSource"/>
1919
</actionGroup>
2020
<actionGroup name="verifyImageOnSlideout">
2121
<arguments>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
</arguments>
9999
<attachFile userInput="{{property.value}}" selector="{{section.uploadImageInput(index)}}" stepKey="attachImageFromLocalToStage"/>
100100
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
101-
<waitForElementVisible selector="{{PageBuilderStage.imageSource(property.fileName)}}" stepKey="waitForMainImageSource1"/>
101+
<waitForElementVisible selector="{{section.imageSource(property.fileName)}}" stepKey="waitForMainImageSource1"/>
102102
</actionGroup>
103103
<actionGroup name="inlineEditWYSIWYGFromStage">
104104
<arguments>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@
8282
<element name="editableButtonOnStage" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]//button//span[@contenteditable='true']" parameterized="true"/>
8383
<element name="wysiwygLinkUrl" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]//a[@href='{{arg2}}']" parameterized="true"/>
8484
<element name="imageOnStage" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]//img[contains(@src,'{{var1}}')]" parameterized="true"/>
85+
<element name="imageSource" type="text" selector="(//div[@data-role='banner'])[1]/div[contains(@style,'{{arg1}}')]" parameterized="true"/>
86+
<element name="uploadImageInput" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
8587
<!-- Appearance Configuration -->
8688
<element name="appearance" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
8789
<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/PageBuilderImageSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<element name="imageSourceByIndex" type="button" selector="(//div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-image')])[{{arg1}}]//img[contains(@src,'{{arg2}}')]" parameterized="true"/>
1717
<element name="imageEmptyPreview" type="text" selector="//div[contains(concat(' ', normalize-space(@class), ' '), ' pagebuilder-image-empty-preview ')]" />
1818
<element name="imagePreview" type="text" selector="//img[contains(concat(' ', normalize-space(@class), ' '), ' preview-image ')]" />
19-
<element name="imageSourceOnStage" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true" />
19+
<element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true" />
2020
<element name="selectFromGalleryBtn" type="button" selector="//figure//div[@class='file-uploader-area']//label[text()='Select from Gallery']"/>
2121
<element name="onHoverSelectFromGalleryButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']" parameterized="true"/>
2222
<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"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,13 @@
142142
<element name="base" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]" parameterized="true"/>
143143
<element name="emptySlide" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content'][contains(@class,'pagebuilder-empty-slide') and text()='Edit Slide Text']" parameterized="true"/>
144144
<element name="editableButtonItemElement" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//a[@data-element='button']//span[contains(@contenteditable, 'true')]" parameterized="true"/>
145+
<element name="imageSource" type="text" selector="(//div[@data-role='slide'])[1]/div[contains(@style,'{{arg1}}')]" parameterized="true"/>
145146
<element name="openOptionsMenu" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{arg1}}]" parameterized="true"/>
146147
<element name="optionsMenu" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{arg1}}]//div[@class='pagebuilder-options-wrapper']" parameterized="true"/>
147148
<element name="optionsMenuButton" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{arg1}}]//li[contains(@class,'pagebuilder-options-link')]//a[contains(@class,'{{arg2}}')]" parameterized="true"/>
148149
<element name="optionsMenuButtonDisabled" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{arg1}}]//li[contains(@class,'pagebuilder-options-link')]//a[contains(@class,'{{arg2}}') and contains(@class,'disabled')]" parameterized="true"/>
149150
<element name="optionsMenuTitle" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{arg1}}]//li[contains(@class,'pagebuilder-options-link')]//div[contains(@class,'option-title')]" parameterized="true"/>
151+
<element name="uploadImageInput" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
150152
<!-- Appearance Configuration -->
151153
<element name="appearance" type="text" selector="(//div[@data-role='slide'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
152154
<element name="slideName" type="button" selector="(//div[@data-role='slide'])[{{arg1}}][@data-slide-name='{{arg2}}']" parameterized="true"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,6 +2039,7 @@
20392039
<comment userInput="Attach image A to PageBuilder stage" stepKey="commentAttachImage"/>
20402040
<actionGroup ref="uploadImageToContentTypeFromStage" stepKey="addImageToStage">
20412041
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
2042+
<argument name="section" value="BannerOnBackend"/>
20422043
</actionGroup>
20432044
<!-- Go to Media Storage from stage -->
20442045
<comment userInput="Go to Media Storage from stage" stepKey="commentGoToMediaStorageFromStage1"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<!-- Assert don't see deleted image on stage -->
5858
<comment userInput="Assert don't see deleted image on stage" stepKey="assertNotToSeeImage"/>
5959
<seeElementInDOM selector="{{ImageOnStage.imageEmptyPreview}}" stepKey="dontSeeImageOnStage1"/>
60-
<dontSeeElementInDOM selector="{{ImageOnStage.imageSourceOnStage(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="dontSeeImageInDOM1"/>
60+
<dontSeeElementInDOM selector="{{ImageOnStage.imageSource(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="dontSeeImageInDOM1"/>
6161
<!-- Attach image C to Image slideout form -->
6262
<comment userInput="Attach image C to Image slideout form" stepKey="attachImageToSlideOut"/>
6363
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
@@ -122,7 +122,7 @@
122122
<!-- Assert not to see image on stage -->
123123
<comment userInput="Assert not to see image on stage" stepKey="commentVerifyImageStage" />
124124
<seeElementInDOM selector="{{ImageOnStage.imageEmptyPreview}}" stepKey="dontSeeImageOnStage3"/>
125-
<dontSeeElementInDOM selector="{{ImageOnStage.imageSourceOnStage(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="dontSeeImageInDOM2"/>
125+
<dontSeeElementInDOM selector="{{ImageOnStage.imageSource(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="dontSeeImageInDOM2"/>
126126
</test>
127127
<test name="ImageAddImageIntoPageBuilderStage">
128128
<annotations>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1381,8 +1381,10 @@
13811381
<!--Upload image from local machine -->
13821382
<comment userInput="Upload image from local machine to stage" stepKey="commentUploadImageToStage"/>
13831383
<actionGroup ref="uploadImageToContentTypeFromStage" stepKey="attachImageFile1">
1384-
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
1384+
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
1385+
<argument name="section" value="SlideOnBackend"/>
13851386
</actionGroup>
1387+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromSlide"/>
13861388
<actionGroup ref="goToMediaStorageFromStage" stepKey="goToMediaStorageFromStage1" >
13871389
<argument name="contentType" value="PageBuilderSliderContentType"/>
13881390
<argument name="section" value="ImageOnStage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTests.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@
229229
<!-- Attach image A to PageBuilder stage-->
230230
<attachFile userInput="{{PageBuilderImageProperty_StageJPG.value}}" selector="{{ImageOnStage.attachImageBtn}}" stepKey="attachImageFileOnStage"/>
231231
<waitForElementVisible selector="{{ImageOnStage.imagePreview}}" stepKey="waitForImagePreview"/>
232-
<waitForElementVisible selector="{{ImageOnStage.imageSourceOnStage('magentoStage')}}" stepKey="waitForImageSource"/>
233-
<seeElement selector="{{ImageOnStage.imageSourceOnStage('magentoStage')}}" stepKey="seeImageSourceOnStage" />
232+
<waitForElementVisible selector="{{ImageOnStage.imageSource('magentoStage')}}" stepKey="waitForImageSource"/>
233+
<seeElement selector="{{ImageOnStage.imageSource('magentoStage')}}" stepKey="seeImageSourceOnStage" />
234234
<seeElement selector="{{ImageOnStage.imageSourceByIndex('1', PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="seeImageOnStage"/>
235235
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
236236
<!-- Verify Image in Tab on storefront -->

0 commit comments

Comments
 (0)