Skip to content

Commit d2b4c5f

Browse files
author
Hwashiang Yu
committed
MC-13769: Add Missing P0-P1 MFTF Tests For PageBuilder On CMS Block - Render Content Through Block
- Updated validateBackgroundImageContainer action group to use js to get the base url - Removed validateBackgroundImageContainer action group prefix param from all tests
1 parent fa895c8 commit d2b4c5f

15 files changed

+8
-102
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@
178178
<actionGroup name="validateBackgroundImageContainer">
179179
<arguments>
180180
<argument name="section"/>
181-
<argument name="pageNamePrefix" defaultValue="admin" type="string"/>
182181
<argument name="backgroundImage"/>
183182
<argument name="index" defaultValue="1" type="string"/>
184183
</arguments>
@@ -187,8 +186,7 @@
187186
<!-- Retrieve background image from computed styles -->
188187
<executeJS function="return window.getComputedStyle({{section.baseJS(index)}}).backgroundImage" stepKey="backgroundImageValue"/>
189188
<!-- Grab base URL -->
190-
<executeJS function="return '{{pageNamePrefix}}'" stepKey="pageNamePrefix"/>
191-
<grabFromCurrentUrl regex="/(^.+(?=\/$pageNamePrefix))/" stepKey="baseURL"/>
189+
<executeJS function="return window.location.origin" stepKey="baseURL"/>
192190
<!-- Convert all characters in string variables to regex friendly strings -->
193191
<executeJS function="return '{$baseURL}'.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\\\^\\$\|]/g, '\\\\$&amp;')" stepKey="regexBaseURL"/>
194192
<executeJS function="return '{{backgroundImage.path}}'.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\\\^\\$\|]/g, '\\\\$&amp;')" stepKey="regexFilePath"/>

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

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,6 @@
672672
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
673673
<argument name="section" value="BannerOnFrontend"/>
674674
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
675-
<argument name="pageNamePrefix" value="banner"/>
676675
</actionGroup>
677676
</test>
678677
<test name="BackgroundImageSelectFromGalleryJPG">
@@ -764,7 +763,6 @@
764763
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
765764
<argument name="section" value="BannerOnFrontend"/>
766765
<argument name="backgroundImage" value="PageBuilderBackgroundImageRoot_JPG"/>
767-
<argument name="pageNamePrefix" value="banner"/>
768766
</actionGroup>
769767
</test>
770768
<test name="BackgroundImageGIF">
@@ -843,7 +841,6 @@
843841
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
844842
<argument name="section" value="BannerOnFrontend"/>
845843
<argument name="backgroundImage" value="PageBuilderBackgroundImage_GIF"/>
846-
<argument name="pageNamePrefix" value="banner"/>
847844
</actionGroup>
848845
</test>
849846
<test name="BackgroundImagePNG">
@@ -922,7 +919,6 @@
922919
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
923920
<argument name="section" value="BannerOnFrontend"/>
924921
<argument name="backgroundImage" value="PageBuilderBackgroundImage_PNG"/>
925-
<argument name="pageNamePrefix" value="banner"/>
926922
</actionGroup>
927923
</test>
928924
<test name="BackgroundImageSpecialCharacters">
@@ -1001,7 +997,6 @@
1001997
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
1002998
<argument name="section" value="BannerOnFrontend"/>
1003999
<argument name="backgroundImage" value="PageBuilderBackgroundImage_SpecialCharacters"/>
1004-
<argument name="pageNamePrefix" value="banner"/>
10051000
</actionGroup>
10061001
</test>
10071002
<test name="BackgroundImageInvalidFileType">
@@ -1250,7 +1245,6 @@
12501245
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
12511246
<argument name="section" value="BannerOnFrontend"/>
12521247
<argument name="backgroundImage" value="PageBuilderBackgroundMobileImage_JPG"/>
1253-
<argument name="pageNamePrefix" value="banner"/>
12541248
</actionGroup>
12551249
</test>
12561250
<test name="BackgroundMobileImageSelectFromGalleryJPG">
@@ -1342,7 +1336,6 @@
13421336
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
13431337
<argument name="section" value="BannerOnFrontend"/>
13441338
<argument name="backgroundImage" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
1345-
<argument name="pageNamePrefix" value="banner"/>
13461339
</actionGroup>
13471340
</test>
13481341
<test name="BackgroundMobileImageGIF">
@@ -1427,7 +1420,6 @@
14271420
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
14281421
<argument name="section" value="BannerOnFrontend"/>
14291422
<argument name="backgroundImage" value="PageBuilderBackgroundMobileImage_GIF"/>
1430-
<argument name="pageNamePrefix" value="banner"/>
14311423
</actionGroup>
14321424
</test>
14331425
<test name="BackgroundMobileImagePNG">
@@ -1512,7 +1504,6 @@
15121504
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
15131505
<argument name="section" value="BannerOnFrontend"/>
15141506
<argument name="backgroundImage" value="PageBuilderBackgroundImage_PNG"/>
1515-
<argument name="pageNamePrefix" value="banner"/>
15161507
</actionGroup>
15171508
</test>
15181509
<test name="BackgroundMobileImageSpecialCharacters">
@@ -1597,7 +1588,6 @@
15971588
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
15981589
<argument name="section" value="BannerOnFrontend"/>
15991590
<argument name="backgroundImage" value="PageBuilderBackgroundMobileImage_SpecialCharacters"/>
1600-
<argument name="pageNamePrefix" value="banner"/>
16011591
</actionGroup>
16021592
</test>
16031593
<test name="BackgroundMobileImageInvalidFileType">
@@ -1685,7 +1675,6 @@
16851675
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
16861676
<argument name="section" value="BannerOnFrontend"/>
16871677
<argument name="backgroundImage" value="PageBuilderBackgroundMobileImage_JPG"/>
1688-
<argument name="pageNamePrefix" value="banner"/>
16891678
</actionGroup>
16901679
</test>
16911680
<test name="BackgroundMobileImageInvalidFileSize">
@@ -1773,7 +1762,6 @@
17731762
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
17741763
<argument name="section" value="BannerOnFrontend"/>
17751764
<argument name="backgroundImage" value="PageBuilderBackgroundMobileImage_JPG"/>
1776-
<argument name="pageNamePrefix" value="banner"/>
17771765
</actionGroup>
17781766
</test>
17791767
<test name="BackgroundPositionTopLeft">
@@ -1869,7 +1857,6 @@
18691857
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
18701858
<argument name="section" value="BannerOnFrontend"/>
18711859
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
1872-
<argument name="pageNamePrefix" value="banner"/>
18731860
</actionGroup>
18741861
</test>
18751862
<test name="BackgroundPositionTopCenter">
@@ -1965,7 +1952,6 @@
19651952
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
19661953
<argument name="section" value="BannerOnFrontend"/>
19671954
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
1968-
<argument name="pageNamePrefix" value="banner"/>
19691955
</actionGroup>
19701956
</test>
19711957
<test name="BackgroundPositionTopRight">
@@ -2061,7 +2047,6 @@
20612047
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
20622048
<argument name="section" value="BannerOnFrontend"/>
20632049
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
2064-
<argument name="pageNamePrefix" value="banner"/>
20652050
</actionGroup>
20662051
</test>
20672052
<test name="BackgroundPositionCenterLeft">
@@ -2157,7 +2142,6 @@
21572142
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
21582143
<argument name="section" value="BannerOnFrontend"/>
21592144
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
2160-
<argument name="pageNamePrefix" value="banner"/>
21612145
</actionGroup>
21622146
</test>
21632147
<test name="BackgroundPositionCenter">
@@ -2253,7 +2237,6 @@
22532237
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
22542238
<argument name="section" value="BannerOnFrontend"/>
22552239
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
2256-
<argument name="pageNamePrefix" value="banner"/>
22572240
</actionGroup>
22582241
</test>
22592242
<test name="BackgroundPositionCenterRight">
@@ -2349,7 +2332,6 @@
23492332
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
23502333
<argument name="section" value="BannerOnFrontend"/>
23512334
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
2352-
<argument name="pageNamePrefix" value="banner"/>
23532335
</actionGroup>
23542336
</test>
23552337
<test name="BackgroundPositionBottomLeft">
@@ -2445,7 +2427,6 @@
24452427
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
24462428
<argument name="section" value="BannerOnFrontend"/>
24472429
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
2448-
<argument name="pageNamePrefix" value="banner"/>
24492430
</actionGroup>
24502431
</test>
24512432
<test name="BackgroundPositionBottomCenter">
@@ -2541,7 +2522,6 @@
25412522
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
25422523
<argument name="section" value="BannerOnFrontend"/>
25432524
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
2544-
<argument name="pageNamePrefix" value="banner"/>
25452525
</actionGroup>
25462526
</test>
25472527
<test name="BackgroundPositionBottomRight">
@@ -2637,7 +2617,6 @@
26372617
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
26382618
<argument name="section" value="BannerOnFrontend"/>
26392619
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
2640-
<argument name="pageNamePrefix" value="banner"/>
26412620
</actionGroup>
26422621
</test>
26432622
<test name="BackgroundRepeatEnabled">
@@ -2733,7 +2712,6 @@
27332712
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
27342713
<argument name="section" value="BannerOnFrontend"/>
27352714
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
2736-
<argument name="pageNamePrefix" value="banner"/>
27372715
</actionGroup>
27382716
</test>
27392717
<test name="BackgroundRepeatDisabled">
@@ -2829,7 +2807,6 @@
28292807
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
28302808
<argument name="section" value="BannerOnFrontend"/>
28312809
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
2832-
<argument name="pageNamePrefix" value="banner"/>
28332810
</actionGroup>
28342811
</test>
28352812
<test name="BackgroundSizeAuto">
@@ -2925,7 +2902,6 @@
29252902
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
29262903
<argument name="section" value="BannerOnFrontend"/>
29272904
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
2928-
<argument name="pageNamePrefix" value="banner"/>
29292905
</actionGroup>
29302906
</test>
29312907
<test name="BackgroundSizeCover">
@@ -3021,7 +2997,6 @@
30212997
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
30222998
<argument name="section" value="BannerOnFrontend"/>
30232999
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
3024-
<argument name="pageNamePrefix" value="banner"/>
30253000
</actionGroup>
30263001
</test>
30273002
<test name="BackgroundSizeContain">
@@ -3117,7 +3092,6 @@
31173092
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
31183093
<argument name="section" value="BannerOnFrontend"/>
31193094
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
3120-
<argument name="pageNamePrefix" value="banner"/>
31213095
</actionGroup>
31223096
</test>
31233097
<test name="BackgroundAttachmentScroll">
@@ -3213,7 +3187,6 @@
32133187
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
32143188
<argument name="section" value="BannerOnFrontend"/>
32153189
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
3216-
<argument name="pageNamePrefix" value="banner"/>
32173190
</actionGroup>
32183191
</test>
32193192
<test name="BackgroundAttachmentFixed">
@@ -3309,7 +3282,6 @@
33093282
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
33103283
<argument name="section" value="BannerOnFrontend"/>
33113284
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
3312-
<argument name="pageNamePrefix" value="banner"/>
33133285
</actionGroup>
33143286
</test>
33153287
</tests>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,15 +215,13 @@
215215
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront1">
216216
<argument name="section" value="BannerOnFrontend"/>
217217
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
218-
<argument name="pageNamePrefix" value="banner"/>
219218
</actionGroup>
220219
<!-- Validate mobile image is displayed when browser is resized -->
221220
<comment userInput="Validate mobile image is displayed when browser is resized" stepKey="commentMobileImage"/>
222221
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
223222
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateMobileImageOnStorefront">
224223
<argument name="section" value="BannerOnFrontend"/>
225224
<argument name="backgroundImage" value="PageBuilderBackgroundMobileImage_GIF"/>
226-
<argument name="pageNamePrefix" value="banner"/>
227225
</actionGroup>
228226
</test>
229227
<test name="BannerCollageCenterMobileWithoutMobileImageValues">
@@ -294,15 +292,13 @@
294292
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront1">
295293
<argument name="section" value="BannerOnFrontend"/>
296294
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
297-
<argument name="pageNamePrefix" value="banner"/>
298295
</actionGroup>
299296
<!-- Validate desktop image still visible in mobile view -->
300297
<comment userInput="Validate desktop image still visible in mobile view" stepKey="commentDesktopImageMobileView"/>
301298
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
302299
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront2">
303300
<argument name="section" value="BannerOnFrontend"/>
304301
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
305-
<argument name="pageNamePrefix" value="banner"/>
306302
</actionGroup>
307303
</test>
308304
<test name="BannerCollageCenterButtonNeverShow">
@@ -1125,7 +1121,6 @@
11251121
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
11261122
<argument name="section" value="BannerOnFrontend"/>
11271123
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
1128-
<argument name="pageNamePrefix" value="banner"/>
11291124
</actionGroup>
11301125
<seeElement selector="{{BannerOnFrontend.messageContent('1', PageBuilderBannerMessageProperty.value)}}" stepKey="seeMessageContentStorefront"/>
11311126
<seeElement selector="{{BannerOnFrontend.linkUrl('1', PageBuilderBannerLinkUrlProperty.value)}}" stepKey="seeLinkUrl"/>
@@ -1172,7 +1167,6 @@
11721167
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateMobileImageStorefront">
11731168
<argument name="section" value="BannerOnFrontend"/>
11741169
<argument name="backgroundImage" value="PageBuilderBackgroundMobileImage_GIF"/>
1175-
<argument name="pageNamePrefix" value="banner"/>
11761170
</actionGroup>
11771171
<click selector="{{BannerOnFrontend.linkUrl('1', PageBuilderBannerLinkUrlProperty.value)}}" stepKey="clickLinkUrl"/>
11781172
<switchToNextTab stepKey="switchToNextTab"/>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,15 +215,13 @@
215215
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront1">
216216
<argument name="section" value="BannerOnFrontend"/>
217217
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
218-
<argument name="pageNamePrefix" value="banner"/>
219218
</actionGroup>
220219
<!-- Validate mobile image is displayed when browser is resized -->
221220
<comment userInput="Validate mobile image is displayed when browser is resized" stepKey="commentMobileImage"/>
222221
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
223222
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateMobileImageOnStorefront">
224223
<argument name="section" value="BannerOnFrontend"/>
225224
<argument name="backgroundImage" value="PageBuilderBackgroundMobileImage_GIF"/>
226-
<argument name="pageNamePrefix" value="banner"/>
227225
</actionGroup>
228226
</test>
229227
<test name="BannerCollageLeftMobileWithoutMobileImageValues">
@@ -294,15 +292,13 @@
294292
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront1">
295293
<argument name="section" value="BannerOnFrontend"/>
296294
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
297-
<argument name="pageNamePrefix" value="banner"/>
298295
</actionGroup>
299296
<!-- Validate desktop image still visible in mobile view -->
300297
<comment userInput="Validate desktop image still visible in mobile view" stepKey="commentDesktopImageMobileView"/>
301298
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
302299
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront2">
303300
<argument name="section" value="BannerOnFrontend"/>
304301
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
305-
<argument name="pageNamePrefix" value="banner"/>
306302
</actionGroup>
307303
</test>
308304
<test name="BannerCollageLeftButtonNeverShow">
@@ -1224,7 +1220,6 @@
12241220
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
12251221
<argument name="section" value="BannerOnFrontend"/>
12261222
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
1227-
<argument name="pageNamePrefix" value="banner"/>
12281223
</actionGroup>
12291224
<seeElement selector="{{BannerOnFrontend.messageContent('1', PageBuilderBannerMessageProperty.value)}}" stepKey="seeMessageContentStorefront"/>
12301225
<seeElement selector="{{BannerOnFrontend.linkUrl('1', PageBuilderBannerLinkUrlProperty.value)}}" stepKey="seeLinkUrl"/>
@@ -1271,7 +1266,6 @@
12711266
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront2">
12721267
<argument name="section" value="BannerOnFrontend"/>
12731268
<argument name="backgroundImage" value="PageBuilderBackgroundMobileImage_GIF"/>
1274-
<argument name="pageNamePrefix" value="banner"/>
12751269
</actionGroup>
12761270
<click selector="{{BannerOnFrontend.linkUrl('1', PageBuilderBannerLinkUrlProperty.value)}}" stepKey="clickLinkUrl"/>
12771271
<switchToNextTab stepKey="switchToNextTab"/>

0 commit comments

Comments
 (0)