Skip to content

Commit 15b83f3

Browse files
nathanjosiahnathanjosiah
committed
Merge branch 'MC-2294' of github.com:magento-trigger/magento2-page-builder into MC-2294
2 parents aa44df3 + d64379e commit 15b83f3

File tree

5 files changed

+9
-15
lines changed

5 files changed

+9
-15
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
<element name="computedBoxSizing" type="button" selector="return window.getComputedStyle(document.querySelector('[data-role=slide]')).boxSizing"/>
108108
</section>
109109
<section name="SlideOnBackend">
110-
<!--<element name="imageOnStage" selector="//div[contains(@style,'{{arg1}}') and contains(@class,'pagebuilder-slide-wrapper')]" type="text" parameterized="true"/>-->
111110
<element name="all" type="button" selector=".pagebuilder-slide"/>
112111
<element name="openOptionsMenu" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{arg1}}]" parameterized="true"/>
113112
<element name="optionsMenu" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{arg1}}]//li[contains(@class,'pagebuilder-options-link')]" parameterized="true"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<element name="computedWidthOnStage" type="text" selector="return parseInt(window.getComputedStyle(document.querySelector('.pagebuilder-{{arg1}}:nth-of-type({{arg2}})')).width)" parameterized="true"/>
3434
<element name="uploadLocalImageBtn" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
3535
<element name="uploadNewImageBtn" type="button" selector="//label[text()='Upload Image']" />
36-
<element name="selectFromGalleryImageBtn" type="button" selector="//div[@data-index='{{arg1}}']//input[@name='{{arg2}}']//following-sibling::label[text()='Select from Gallery']" parameterized="true"/>
36+
<element name="selectFromGalleryImageBtn" type="button" selector="//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']" parameterized="true"/>
3737
</section>
3838
<section name="PageBuilderPanel">
3939
<element name="searchField" type="input" selector='//*[@id="pagebuilder-panel"]/div[1]/a'/>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1947,7 +1947,8 @@
19471947
</actionGroup>
19481948
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut1"/>
19491949
<comment userInput="Assert not to see deleted image on stage" stepKey="assertNotToSeeImage1"/>
1950-
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="dontSeeImageOnStage1"/>
1950+
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="seeBannerPlaceholder1"/>
1951+
<dontSeeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderBackgroundImage_JPG.fileName)}}" stepKey="dontSeeImageInDOM1"/>
19511952
<!-- Attach image C to Image slideout form -->
19521953
<comment userInput="Attach image C to Image slideout form" stepKey="attachImageToSlideOut"/>
19531954
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
@@ -1970,6 +1971,7 @@
19701971
<!--<conditionalClick selector=".modals-overlay" dependentSelector=".modals-overlay" stepKey="clickOverlay" visible="true"/>-->
19711972
<dontSeeElementInDOM selector="{{EditPanelForm.editFormUploadedImageSource(PageBuilderBackgroundImage_JPG.section, PageBuilderBackgroundImage_JPG.fieldName, PageBuilderBackgroundImage_JPG.fileName, PageBuilderBackgroundImage_JPG.extension)}}" stepKey="dontSeeImage"/>
19721973
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
1973-
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="dontSeeImageOnStage2"/>
1974+
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="seeBannerPlaceholder2"/>
1975+
<dontSeeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderBackgroundImage_JPG.fileName)}}" stepKey="dontSeeImageInDOM2"/>
19741976
</test>
19751977
</tests>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<!-- Assert don't see deleted image on stage -->
6161
<comment userInput="Assert don't see deleted image on stage" stepKey="assertNotToSeeImage"/>
6262
<seeElementInDOM selector="{{ImageOnStage.imageEmptyPreview}}" stepKey="dontSeeImageOnStage1"/>
63+
<dontSeeElementInDOM selector="{{ImageOnStage.imageSourceOnStage(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="dontSeeImageInDOM1"/>
6364
<!-- Attach image C to Image slideout form -->
6465
<comment userInput="Attach image C to Image slideout form" stepKey="attachImageToSlideOut"/>
6566
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
@@ -79,7 +80,6 @@
7980
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage3">
8081
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
8182
</actionGroup>
82-
<!--<conditionalClick selector=".modals-overlay" dependentSelector=".modals-overlay" stepKey="clickOverlay" visible="true"/>-->
8383
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut3"/>
8484
<dontSeeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="dontSeeMainImageSource"/>
8585
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
@@ -89,7 +89,7 @@
8989
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
9090
<argument name="contentType" value="PageBuilderImageContentType"/>
9191
</actionGroup>
92-
<click selector="{{PageBuilderStage.selectFromGalleryImageBtn(PageBuilderImageProperty_JPG2.section,PageBuilderImageProperty_JPG2.fieldName)}}" stepKey="clickSelectfromGallery"/>
92+
<click selector="{{PageBuilderStage.selectFromGalleryImageBtn}}" stepKey="clickSelectfromGallery"/>
9393
<waitForPageLoad stepKey="waitForPageLoad"/>
9494
<actionGroup ref="CreateImageFolder" stepKey="createImageFolder">
9595
<argument name="ImageFolder" value="ImageFolder"/>
@@ -109,10 +109,10 @@
109109
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage4">
110110
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
111111
</actionGroup>
112-
<conditionalClick selector=".modals-overlay" dependentSelector=".modals-overlay" stepKey="clickOverlay2" visible="true"/>
113112
<dontSeeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="dontSeeMainImageSource2"/>
114113
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
115114
<seeElementInDOM selector="{{ImageOnStage.imageEmptyPreview}}" stepKey="dontSeeImageOnStage3"/>
115+
<dontSeeElementInDOM selector="{{ImageOnStage.imageSourceOnStage(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="dontSeeImageInDOM2"/>
116116
</test>
117117
<test name="ImageAddImageIntoPageBuilderStage">
118118
<annotations>

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1913,21 +1913,14 @@
19131913
</actionGroup>
19141914
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeStorage"/>
19151915
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings1"/>
1916-
<!--<conditionalClick selector=".modals-overlay" dependentSelector=".modals-overlay" stepKey="clickOverlay1" visible="true"/>-->
19171916
<dontSeeElementInDOM selector="{{SlideOnBackend.slideBackgroundImage('0',PageBuilderSlideBackgroundImageProperty1.path, PageBuilderSlideBackgroundImageProperty1.extension)}}" stepKey="dontSeeImageNameOnPreview1"/>
19181917
<!--Upload image from local machine -->
19191918
<comment userInput="Upload image from local machine to stage" stepKey="commentUploadImageToStage"/>
19201919
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachImageFile1">
19211920
<argument name="property" value="PageBuilderSlideBackgroundImageProperty1"/>
19221921
</actionGroup>
1923-
<!--<waitForElementVisible selector="{{SlideOnBackend.slideBackgroundImage('0',PageBuilderSlideBackgroundImageProperty1.path, PageBuilderSlideBackgroundImageProperty1.extension)}}" stepKey="waitForMainImageSource1"/>-->
1924-
<!--<click selector="{{SliderInAdmin.slideWrapper}}" stepKey="clickSliderInStage"/>-->
1925-
<!--<waitForElementVisible selector="{{ImageOnStage.selectFromGalleryImageBtn}}" stepKey="seeSelectFromGalleryBtn2" />-->
1926-
<!--<click selector="{{ImageOnStage.selectFromGalleryImageBtn}}" stepKey="clickSelectFromGallery" />-->
1927-
<!--<waitForPageLoad stepKey="waitForPageLoad2" />-->
1928-
<!--<waitForLoadingMaskToDisappear stepKey="waitForLoading2" />-->
19291922
<actionGroup ref="goToMediaStorageFromStage" stepKey="goToMediaStorageFromStage1" >
1930-
<argument name="contentType" value="PageBuildersSliderContentType"/>
1923+
<argument name="contentType" value="PageBuilderSliderContentType"/>
19311924
<argument name="section" value="ImageOnStage"/>
19321925
</actionGroup>
19331926
<!-- Delete image A -->

0 commit comments

Comments
 (0)