Skip to content

Commit bbbf68c

Browse files
committed
MC-3354: All Attributes Banner
- Removing remaining hardcoded Banner elements - Updating all affected tests - Adding resizeWindow in Banner after steps
1 parent 1dfa16f commit bbbf68c

6 files changed

+324
-222
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,6 @@
6565
<element name="posterPadding" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
6666
<element name="collagePadding" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'padding: {{arg2}};')]" parameterized="true"/>
6767
<element name="mobileCollagePadding" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'padding: {{arg2}};')]" parameterized="true"/>
68-
69-
<!--fix or replace these-->
70-
<element name="collageLeft" type="button" selector="div[data-role='banner'] .pagebuilder-mobile-hidden[style*='40px calc(50% + 40px) 40px 40px'][style*='magento']"/>
71-
<element name="collageCentered" type="button" selector="div[data-role='banner'] .pagebuilder-mobile-hidden[style*='40px calc(25% + 40px)'][style*='magento']"/>
72-
<element name="collageRight" type="button" selector="div[data-role='banner'] .pagebuilder-mobile-hidden[style*='40px 40px 40px calc(50% + 40px)'][style*='magento']"/>
73-
<element name="posterMobileWithMobileImage" type="button" selector="div[data-role='banner'] .pagebuilder-mobile-only[style*='m-logo']"/>
74-
<element name="collageMobileWithMobileImage" type="button" selector="div[data-role='banner'] .pagebuilder-mobile-only[style*='padding: 40px;'][style*='m-logo']"/>
75-
<element name="collageMobileWithoutMobileImage" type="button" selector="div[data-role='banner'] .pagebuilder-mobile-only[style*='padding: 40px;'][style*='magento']"/>
76-
7768
</section>
7869
<section name="BannerOnBackend">
7970
<element name="base" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]" parameterized="true"/>

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

Lines changed: 48 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<annotations>
1313
<features value="PageBuilder"/>
1414
<stories value="Banner"/>
15-
<title value="Collage Center - Check value of a collage center mobile banner with mobile image"/>
16-
<description value="Check value of a collage center mobile banner with mobile image"/>
15+
<title value="Collage Center - Check desktop and mobile images of a collage left banner with mobile image"/>
16+
<description value="Check desktop and mobile images of a collage left banner with mobile image"/>
1717
<severity value="CRITICAL"/>
1818
<useCaseId value="MAGETWO-83553"/>
1919
<testCaseId value="MAGETWO-89591"/>
@@ -27,6 +27,7 @@
2727
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2828
</before>
2929
<after>
30+
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
3031
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
3132
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
3233
<argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -59,60 +60,45 @@
5960
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
6061
<argument name="property" value="PageBuilderBannerCollageCenteredProperty"/>
6162
</actionGroup>
62-
<actionGroup ref="expandConfigurationSection" stepKey="expandAdvancedSection"/>
63-
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="seeDefaultPaddingsInAdmin">
64-
<argument name="property" value="PageBuilderPaddingProperty40"/>
65-
</actionGroup>
6663
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderFile">
6764
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
6865
</actionGroup>
6966
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderMobileFile">
7067
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
7168
</actionGroup>
72-
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
73-
<argument name="property" value="PageBuilderBannerShowButtonAlwaysProperty"/>
74-
</actionGroup>
75-
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBannerButtonText">
76-
<argument name="property" value="PageBuilderBannerButtonTextProperty"/>
77-
</actionGroup>
78-
<actionGroup ref="fillSlideOutPanelLinkUrlField" stepKey="enterBannerLinkUrl">
79-
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
80-
<argument name="selection" value="{{ExternalLink.url}}"/>
81-
<argument name="newTab" value="PageBuilderBannerNewTabDefaultProperty"/>
82-
</actionGroup>
83-
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBannerShowOverlayAlways">
84-
<argument name="property" value="PageBuilderBannerShowContentOverlayAlwaysProperty"/>
85-
</actionGroup>
8669
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
8770
<!-- Validate Stage -->
8871
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
89-
<waitForElementVisible time="2" selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="waitForCollageCenteredInAdmin" />
90-
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="verifyCollageCenteredInAdmin"/>
72+
<actionGroup ref="validateBackgroundImage" stepKey="validateImageStage">
73+
<argument name="section" value="BannerOnBackend"/>
74+
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
75+
</actionGroup>
9176
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
77+
<!-- Validate Storefront -->
78+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
9279
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
9380
<argument name="contentType" value="PageBuilderBannerContentType"/>
9481
</actionGroup>
95-
<!-- Validate Storefront -->
96-
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
97-
<seeElement selector="{{BannerOnFrontend.base('1')}}" stepKey="verifyBannerInFrontend"/>
98-
<waitForElementVisible time="3" selector="{{BannerOnFrontend.collageCentered}}" stepKey="waitForCollageCenteredInFrontend"/>
99-
<seeElement selector="{{BannerOnFrontend.collageCentered}}" stepKey="verifyCollageCenteredInFrontend"/>
100-
<dontSeeElement selector="{{BannerOnFrontend.collageMobileWithMobileImage}}" stepKey="dontSeeCollageCenteredInFrontendMobileWithMobileImage"/>
82+
<actionGroup ref="validateBackgroundImage" stepKey="validateImageStorefront">
83+
<argument name="section" value="BannerOnFrontend"/>
84+
<argument name="pageNamePrefix" value="banner"/>
85+
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
86+
</actionGroup>
87+
<dontSeeElement selector="{{BannerOnFrontend.backgroundMobileImage('1', PageBuilderBackgroundMobileImage_GIF.fileName)}}" stepKey="dontSeeMobileImage"/>
88+
<actionGroup ref="validateBackgroundMobileImage" stepKey="validateMobileImageStorefront">
89+
<argument name="section" value="BannerOnFrontend"/>
90+
<argument name="pageNamePrefix" value="banner"/>
91+
<argument name="backgroundMobileImage" value="PageBuilderBackgroundMobileImage_GIF"/>
92+
</actionGroup>
10193
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
102-
<waitForElementVisible time="3" selector="{{BannerOnFrontend.collageMobileWithMobileImage}}" stepKey="waitForCollageCenteredInFrontendMobileWithMobileImage"/>
103-
<seeElement selector="{{BannerOnFrontend.collageMobileWithMobileImage}}" stepKey="verifyCollageCenteredInFrontendMobileWithMobileImage"/>
104-
<dontSeeElement selector="{{BannerOnFrontend.collageCentered}}" stepKey="dontSeeCollageCenteredInFrontend"/>
105-
<resizeWindow width="1000" height="1000" stepKey="resizeWindowToDesktop"/>
106-
<waitForElementVisible time="3" selector="{{BannerOnFrontend.collageCentered}}" stepKey="waitForCollageCenteredInFrontend2"/>
107-
<seeElement selector="{{BannerOnFrontend.collageCentered}}" stepKey="verifyCollageCenteredInFrontend2"/>
108-
<dontSeeElement selector="{{BannerOnFrontend.collageMobileWithMobileImage}}" stepKey="dontSeeCollageCenteredInFrontendMobileWithMobileImage2"/>
94+
<dontSeeElement selector="{{BannerOnFrontend.backgroundImage('1', PageBuilderBackgroundImage_JPG.fileName)}}" stepKey="dontSeeDesktopImage"/>
10995
</test>
11096
<test name="BannerCollageCenterMobileWithoutMobileImageValues">
11197
<annotations>
11298
<features value="PageBuilder"/>
11399
<stories value="Banner"/>
114-
<title value="Collage Center - Check value of a collage center mobile banner without mobile image"/>
115-
<description value="Check value of a collage center mobile banner without mobile image"/>
100+
<title value="Collage Center - Check desktop and mobile images of a collage left banner without mobile image"/>
101+
<description value="Check desktop and mobile images of a collage left banner without mobile image"/>
116102
<severity value="CRITICAL"/>
117103
<useCaseId value="MAGETWO-83553"/>
118104
<testCaseId value="MAGETWO-89588"/>
@@ -126,6 +112,7 @@
126112
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
127113
</before>
128114
<after>
115+
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
129116
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
130117
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
131118
<argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -152,50 +139,34 @@
152139
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
153140
<argument name="property" value="PageBuilderBannerCollageCenteredProperty"/>
154141
</actionGroup>
155-
<actionGroup ref="expandConfigurationSection" stepKey="expandAdvancedSection"/>
156-
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="seeDefaultPaddingsInAdmin">
157-
<argument name="property" value="PageBuilderPaddingProperty40"/>
158-
</actionGroup>
159142
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderFile">
160143
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
161144
</actionGroup>
162-
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
163-
<argument name="property" value="PageBuilderBannerShowButtonAlwaysProperty"/>
164-
</actionGroup>
165-
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBannerButtonText">
166-
<argument name="property" value="PageBuilderBannerButtonTextProperty"/>
167-
</actionGroup>
168-
<actionGroup ref="fillSlideOutPanelLinkUrlField" stepKey="enterBannerLinkUrl">
169-
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
170-
<argument name="selection" value="{{ExternalLink.url}}"/>
171-
<argument name="newTab" value="PageBuilderBannerNewTabDefaultProperty"/>
172-
</actionGroup>
173-
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBannerShowOverlayAlways">
174-
<argument name="property" value="PageBuilderBannerShowContentOverlayAlwaysProperty"/>
175-
</actionGroup>
176145
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
177146
<!-- Validate Stage -->
178147
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
179-
<waitForElementVisible time="2" selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="waitForCollageCenteredInAdmin" />
180-
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="verifyCollageCenteredInAdmin"/>
148+
<actionGroup ref="validateBackgroundImage" stepKey="validateImageStage">
149+
<argument name="section" value="BannerOnBackend"/>
150+
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
151+
</actionGroup>
181152
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
153+
<!-- Validate Storefront -->
154+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
182155
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
183156
<argument name="contentType" value="PageBuilderBannerContentType"/>
184157
</actionGroup>
185-
<!-- Validate Storefront -->
186-
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
187-
<seeElement selector="{{BannerOnFrontend.base('1')}}" stepKey="verifyBannerInFrontend"/>
188-
<waitForElementVisible time="3" selector="{{BannerOnFrontend.collageCentered}}" stepKey="waitForCollageCenteredInFrontend"/>
189-
<seeElement selector="{{BannerOnFrontend.collageCentered}}" stepKey="verifyCollageCenteredInFrontend"/>
190-
<dontSeeElement selector="{{BannerOnFrontend.collageMobileWithoutMobileImage}}" stepKey="dontSeeCollageCenteredInFrontendMobileWithoutMobileImage"/>
191-
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
192-
<waitForElementVisible time="3" selector="{{BannerOnFrontend.collageMobileWithoutMobileImage}}" stepKey="waitForCollageCenteredInFrontendMobileWithoutMobileImage"/>
193-
<seeElement selector="{{BannerOnFrontend.collageMobileWithoutMobileImage}}" stepKey="verifyCollageCenteredInFrontendMobileWithoutMobileImage"/>
194-
<dontSeeElement selector="{{BannerOnFrontend.collageCentered}}" stepKey="dontSeeCollageCenteredInFrontend"/>
195-
<resizeWindow width="1000" height="1000" stepKey="resizeWindowToDesktop"/>
196-
<waitForElementVisible time="3" selector="{{BannerOnFrontend.collageCentered}}" stepKey="waitForCollageCenteredInFrontend2"/>
197-
<seeElement selector="{{BannerOnFrontend.collageCentered}}" stepKey="verifyCollageCenteredInFrontend2"/>
198-
<dontSeeElement selector="{{BannerOnFrontend.collageMobileWithoutMobileImage}}" stepKey="dontSeeCollageCenteredInFrontendMobileWithoutMobileImage2"/>
158+
<actionGroup ref="validateBackgroundImage" stepKey="validateImageStorefront">
159+
<argument name="section" value="BannerOnFrontend"/>
160+
<argument name="pageNamePrefix" value="banner"/>
161+
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
162+
</actionGroup>
163+
<!-- Validate Image Still Visible In Mobile -->
164+
<comment userInput="Validate Image Still Visible In Mobile" stepKey="commentValidateStorefront2"/>
165+
<actionGroup ref="validateBackgroundMobileImage" stepKey="validateMobileImageStorefront">
166+
<argument name="section" value="BannerOnFrontend"/>
167+
<argument name="pageNamePrefix" value="banner"/>
168+
<argument name="backgroundMobileImage" value="PageBuilderBackgroundImage_JPG"/>
169+
</actionGroup>
199170
</test>
200171
<test name="BannerCollageCenterButtonNeverShow">
201172
<annotations>
@@ -216,6 +187,7 @@
216187
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
217188
</before>
218189
<after>
190+
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
219191
<actionGroup ref="logout" stepKey="logout"/>
220192
</after>
221193
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -288,6 +260,7 @@
288260
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
289261
</before>
290262
<after>
263+
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
291264
<actionGroup ref="logout" stepKey="logout"/>
292265
</after>
293266
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -363,6 +336,7 @@
363336
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
364337
</before>
365338
<after>
339+
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
366340
<actionGroup ref="logout" stepKey="logout"/>
367341
</after>
368342
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -435,6 +409,7 @@
435409
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
436410
</before>
437411
<after>
412+
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
438413
<actionGroup ref="logout" stepKey="logout"/>
439414
</after>
440415
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -513,6 +488,7 @@
513488
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
514489
</before>
515490
<after>
491+
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
516492
<actionGroup ref="logout" stepKey="logout"/>
517493
</after>
518494
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -889,6 +865,7 @@
889865
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
890866
</before>
891867
<after>
868+
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
892869
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
893870
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
894871
<argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>

0 commit comments

Comments
 (0)