Skip to content

Commit 8dc554f

Browse files
committed
MAGETWO-75104: Build stabilization
1 parent f34f097 commit 8dc554f

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Data/BannerData.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<data key="name">Background Image</data>
2020
<data key="section">background</data>
2121
<data key="fieldName">background_image</data>
22-
<data key="value">magento.jpg</data>
23-
<data key="fileName">magento</data>
22+
<data key="value">magento3.jpg</data>
23+
<data key="fileName">magento3</data>
2424
<data key="fileType">jpg</data>
2525
<data key="path">wysiwyg/magento</data>
2626
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>

app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<data key="name">Background Image</data>
1919
<data key="section">background</data>
2020
<data key="fieldName">background_image</data>
21-
<data key="value">magento.jpg</data>
22-
<data key="fileName">magento</data>
21+
<data key="value">magento3.jpg</data>
22+
<data key="fileName">magento3</data>
2323
<data key="fileType">jpg</data>
2424
<data key="path">wysiwyg/magento</data>
2525
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
<element name="uploadLocalImageBtn" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
9595
<element name="uploadNewImageBtn" type="button" selector="//label[text()='Upload Image']" />
9696
<element name="selectFromGalleryImageBtn" type="button" selector="//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']"/>
97+
<element name="imageSourceOnFrontEnd" type="button" selector="//div[not(contains(@class, 'pagebuilder-mobile-hidden')) and contains(@style, '{{var1}}')]" parameterized="true" />
9798
</section>
9899
<section name="AdvancedForm">
99100
<element name="sectionName" type="button" selector="//div[@data-index='advanced']"/>

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,8 +1106,8 @@
11061106
<!--Upload image from local machine -->
11071107
<comment userInput="Upload image from local machine" stepKey="commentUploadImageFromLocal" />
11081108
<attachFile userInput="{{PageBuilderLocalImagePropertyJpg.value}}" selector="{{PageBuilderActionsSection.uploadLocalImageBtn}}" stepKey="attachImageFromLocalToStage"/>
1109-
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImagePropertyJpg.fileName)}}" stepKey="waitForMainImageSource1"/>
1110-
<seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImagePropertyJpg.fileName)}}" stepKey="seeMainImageSource1"/>
1109+
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderLocalImagePropertyJpg.fileName)}}" stepKey="waitForMainImageSource1"/>
1110+
<seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderLocalImagePropertyJpg.fileName)}}" stepKey="seeMainImageSource1"/>
11111111
<!--Upload image from Media Gallery Storage -->
11121112
<comment userInput="Upload image from Media Gallery Storage" stepKey="commentUploadImageFromStorage"/>
11131113
<click selector="{{ImageOnStage.selectFromGalleryImageBtn}}" stepKey="clickSelectFromGallery" />
@@ -1120,8 +1120,7 @@
11201120
<argument name="Image" value="PageBuilderBannerBackgroundImageProperty"/>
11211121
</actionGroup>
11221122
<actionGroup ref="saveImage" stepKey="saveImage"/>
1123-
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderBannerBackgroundImageProperty.fileName)}}" stepKey="waitForMainImageSource2"/>
1124-
<seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderBannerBackgroundImageProperty.fileName)}}" stepKey="seeMainImageSource2"/>
1123+
<seeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderBannerBackgroundImageProperty.fileName)}}" stepKey="seeImageInDOM"/>
11251124
<comment userInput="Go to Banner slide-out to verify uploaded image" stepKey="commentGoToBannerSlideOut"/>
11261125
<!--Verify uploaded image is displayed on slide-out-->
11271126
<comment userInput="Verify uploaded image is displayed on slide-out" stepKey="commentVerifyImageOnSlideout"/>
@@ -1137,7 +1136,7 @@
11371136
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
11381137
<amOnPage url="$$createPreReqCMSPage.identifier$$" stepKey="amOnCmsStorefront" />
11391138
<waitForPageLoad stepKey="waitForPageLoad3" />
1140-
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderBannerBackgroundImageProperty.fileName)}}" stepKey="seeMainImageSourceOnFrontend"/>
1139+
<seeElementInDOM selector="{{PageBuilderActionsSection.imageSourceOnFrontEnd(PageBuilderBannerBackgroundImageProperty.fileName)}}" stepKey="seeMainImageSourceOnFrontend"/>
11411140
</test>
11421141
<test name="VerifyUploadImageOnBannerStageDependOnEachTypeOfAppearance">
11431142
<annotations>

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,8 +1083,8 @@
10831083
<comment userInput="Upload image from local machine" stepKey="commentUploadImageFromLocal" />
10841084
<attachFile userInput="{{PageBuilderLocalImagePropertyJpg.value}}" selector="{{PageBuilderActionsSection.uploadLocalImageBtn}}" stepKey="attachImageFromLocalToStage"/>
10851085
<waitForPageLoad stepKey="waitForPageLoad4" />
1086-
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImagePropertyJpg.fileName)}}" stepKey="waitForMainImageSource1"/>
1087-
<seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImagePropertyJpg.fileName)}}" stepKey="seeMainImageSource1"/>
1086+
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderLocalImagePropertyJpg.fileName)}}" stepKey="waitForMainImageSource1"/>
1087+
<seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderLocalImagePropertyJpg.fileName)}}" stepKey="seeMainImageSource1"/>
10881088
<!--Upload image from Media Gallery Storage -->
10891089
<comment userInput="Upload image from Media Gallery Storage" stepKey="commentUploadImageFromStorage"/>
10901090
<click selector="{{SliderInAdmin.slideWrapper}}" stepKey="clickSliderInStage"/>
@@ -1099,8 +1099,7 @@
10991099
<argument name="Image" value="PageBuilderSliderBackgroundImageProperty"/>
11001100
</actionGroup>
11011101
<actionGroup ref="saveImage" stepKey="saveImage"/>
1102-
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderSliderBackgroundImageProperty.fileName)}}" stepKey="waitForMainImageSource2"/>
1103-
<seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderSliderBackgroundImageProperty.fileName)}}" stepKey="seeMainImageSource2"/>
1102+
<seeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderSliderBackgroundImageProperty.fileName)}}" stepKey="seeImageInDOM"/>
11041103
<!--Verify uploaded image is displayed on slide-out-->
11051104
<comment userInput="Verify uploaded image is displayed on slide-out" stepKey="commentVerifyImageOnSlideout"/>
11061105
<actionGroup ref="openSlideOptionsByIndex" stepKey="openFirstSlideOptions">
@@ -1115,7 +1114,7 @@
11151114
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
11161115
<amOnPage url="$$createPreReqCMSPage.identifier$$" stepKey="amOnCmsStorefront" />
11171116
<waitForPageLoad stepKey="waitForPageLoad3" />
1118-
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImagePropertyJpg.fileName)}}" stepKey="seeMainImageSourceOnFrontend"/>
1117+
<seeElementInDOM selector="{{PageBuilderActionsSection.imageSourceOnFrontEnd(PageBuilderSliderBackgroundImageProperty.fileName)}}" stepKey="seeMainImageSourceOnFrontend"/>
11191118
</test>
11201119
<test name="VerifyUploadImageOnSliderStageDependOnEachTypeOfAppearance">
11211120
<annotations>

0 commit comments

Comments
 (0)