Skip to content

Commit 9012c8a

Browse files
committed
#557: User access Row action panel with 2+ level nesting - Fixed video actionGroup
1 parent fa7a827 commit 9012c8a

File tree

4 files changed

+21
-1
lines changed

4 files changed

+21
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,15 @@
1818
<argument name="lazyLoad" defaultValue="PageBuilderVideoBackgroundLazyLoad_Enabled"/>
1919
<argument name="playOnlyWhenVisible" defaultValue="PageBuilderVideoBackgroundPlayOnlyWhenVisible_Enabled"/>
2020
<argument name="index" defaultValue="1" type="string"/>
21+
<argument name="defaultBackgroundColor" defaultValue="PageBuilderBackgroundColor_Default"/>
2122
</arguments>
2223
<waitForPageLoad stepKey="waitForPageLoad"/>
2324
<waitForElementVisible selector="{{section.backgroundType(index, 'video')}}" stepKey="waitForVideoBackground"/>
24-
<dontSeeElementInDOM selector="{{section.backgroundColorElement(index)}}" stepKey="dontSeeBackgroundColorInDOM"/>
25+
<executeJS function="return window.getComputedStyle(document.evaluate('{{section.backgroundPath(index)}}', document.body).iterateNext()).backgroundColor" stepKey="grabBackgroundColorValue"/>
26+
<assertEquals stepKey="dontSeeBackgroundColorInDOM">
27+
<expectedResult type="string">{{defaultBackgroundColor.rgb}}</expectedResult>
28+
<actualResult type="variable">grabBackgroundColorValue</actualResult>
29+
</assertEquals>
2530
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
2631
<waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
2732
<grabAttributeFrom selector="{{section.videoBackgroundJarallaxContainer(index)}}" userInput="style" stepKey="jarallaxStyle"/>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<actionGroup ref="validateVideoBackgroundWithOnlyVideoUrl" stepKey="validateStage1">
6868
<argument name="section" value="BannerOnBackend"/>
6969
<argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_YouTube_Embedded"/>
70+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
7071
</actionGroup>
7172
<!-- Update to YouTube Non-Embedded -->
7273
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -79,6 +80,7 @@
7980
<actionGroup ref="validateVideoBackgroundWithOnlyVideoUrl" stepKey="validateStage2">
8081
<argument name="section" value="BannerOnBackend"/>
8182
<argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_YouTube_NonEmbedded"/>
83+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
8284
</actionGroup>
8385
<!-- Update to Vimeo Embedded-->
8486
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage4">
@@ -91,6 +93,7 @@
9193
<actionGroup ref="validateVideoBackgroundWithOnlyVideoUrl" stepKey="validateStage4">
9294
<argument name="section" value="BannerOnBackend"/>
9395
<argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_Vimeo_Embedded"/>
96+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
9497
</actionGroup>
9598
<!-- Update to Vimeo Non-Embedded -->
9699
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage5">
@@ -103,6 +106,7 @@
103106
<actionGroup ref="validateVideoBackgroundWithOnlyVideoUrl" stepKey="validateStage5">
104107
<argument name="section" value="BannerOnBackend"/>
105108
<argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_Vimeo_NonEmbedded"/>
109+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
106110
</actionGroup>
107111
<!-- Update to .mp4 URL -->
108112
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage7">
@@ -115,6 +119,7 @@
115119
<actionGroup ref="validateVideoBackgroundWithOnlyVideoUrl" stepKey="validateStage7">
116120
<argument name="section" value="BannerOnBackend"/>
117121
<argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_Mp4_URL"/>
122+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
118123
</actionGroup>
119124
</test>
120125
</tests>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
<argument name="infiniteLoop" value="PageBuilderVideoBackgroundInfiniteLoop_Disabled"/>
7777
<argument name="lazyLoad" value="PageBuilderVideoBackgroundLazyLoad_Disabled"/>
7878
<argument name="playOnlyWhenVisible" value="PageBuilderVideoBackgroundPlayOnlyWhenVisible_Disabled"/>
79+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
7980
</actionGroup>
8081
<actionGroup ref="inlineEditWYSIWYGFromStage" stepKey="inlineEdit">
8182
<argument name="contentType" value="PageBuilderBannerContentType"/>
@@ -98,6 +99,7 @@
9899
<argument name="infiniteLoop" value="PageBuilderVideoBackgroundInfiniteLoop_Disabled"/>
99100
<argument name="lazyLoad" value="PageBuilderVideoBackgroundLazyLoad_Disabled"/>
100101
<argument name="playOnlyWhenVisible" value="PageBuilderVideoBackgroundPlayOnlyWhenVisible_Disabled"/>
102+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
101103
</actionGroup>
102104
<waitForElementVisible selector="{{BannerOnBackend.messageContent('1', PageBuilderBannerMessageProperty.value)}}" stepKey="waitForMessageContentStage2"/>
103105
<waitForElementVisible selector="{{BannerOnBackend.buttonText('1', PageBuilderBannerButtonTextProperty.value)}}" stepKey="waitForButtonTextStage2"/>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<actionGroup ref="validateVideoBackgroundWithOnlyVideoUrl" stepKey="validateYouTubeEmbeddedStage">
6969
<argument name="section" value="SlideOnBackend"/>
7070
<argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_YouTube_Embedded"/>
71+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
7172
</actionGroup>
7273
<!-- Update to YouTube Non-Embedded -->
7374
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStageYouTubeNonEmbedded">
@@ -80,6 +81,7 @@
8081
<actionGroup ref="validateVideoBackgroundWithOnlyVideoUrl" stepKey="validateYouTubeNonEmbeddedStage">
8182
<argument name="section" value="SlideOnBackend"/>
8283
<argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_YouTube_NonEmbedded"/>
84+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
8385
</actionGroup>
8486
<!-- Update to YouTube Insecure -->
8587
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStageYouTubeInsecure">
@@ -92,6 +94,7 @@
9294
<actionGroup ref="validateVideoBackgroundWithOnlyVideoUrl" stepKey="validateYouTubeInsecureStage">
9395
<argument name="section" value="SlideOnBackend"/>
9496
<argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_YouTube_Insecure"/>
97+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
9598
</actionGroup>
9699
<!-- Update to Vimeo Embedded-->
97100
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStageVimeoEmbedded">
@@ -104,6 +107,7 @@
104107
<actionGroup ref="validateVideoBackgroundWithOnlyVideoUrl" stepKey="validateVimeoEmbeddedStage">
105108
<argument name="section" value="SlideOnBackend"/>
106109
<argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_Vimeo_Embedded"/>
110+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
107111
</actionGroup>
108112
<!-- Update to Vimeo Non-Embedded -->
109113
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStageVimeoNonEmbedded">
@@ -116,6 +120,7 @@
116120
<actionGroup ref="validateVideoBackgroundWithOnlyVideoUrl" stepKey="validateVimeoNonEmbeddedStage">
117121
<argument name="section" value="SlideOnBackend"/>
118122
<argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_Vimeo_NonEmbedded"/>
123+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
119124
</actionGroup>
120125
<!-- Update to Vimeo Insecure -->
121126
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStageVimeoInsecure">
@@ -128,6 +133,7 @@
128133
<actionGroup ref="validateVideoBackgroundWithOnlyVideoUrl" stepKey="validateVimeoInsecureStage">
129134
<argument name="section" value="SlideOnBackend"/>
130135
<argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_Vimeo_Insecure"/>
136+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
131137
</actionGroup>
132138
<!-- Update to .mp4 URL -->
133139
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStageMp4">
@@ -140,6 +146,7 @@
140146
<actionGroup ref="validateVideoBackgroundWithOnlyVideoUrl" stepKey="validateMp4Stage">
141147
<argument name="section" value="SlideOnBackend"/>
142148
<argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_Mp4_URL"/>
149+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
143150
</actionGroup>
144151
<!-- Update to .mp4 URL Insecure -->
145152
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStageMp4Insecure">
@@ -152,6 +159,7 @@
152159
<actionGroup ref="validateVideoBackgroundWithOnlyVideoUrl" stepKey="validateMp4InsecureStage">
153160
<argument name="section" value="SlideOnBackend"/>
154161
<argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_Mp4_URL_Insecure"/>
162+
<argument name="defaultBackgroundColor" value="PageBuilderStageBackgroundColor_Default"/>
155163
</actionGroup>
156164
</test>
157165
</tests>

0 commit comments

Comments
 (0)