Skip to content

Commit 33377b4

Browse files
glo71317glo71317
authored
Merge pull request #395 from magento-gl/spartans_pr_27022025
[Spartans] BugFixes Delivery
2 parents adfb174 + ab69efa commit 33377b4

15 files changed

+275
-74
lines changed

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2025 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
18+
-->
19+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
21+
<actionGroup name="ValidateVideoBackgroundLoadedButNotPlayingAlternateActionGroup" extends="validateVideoBackgroundPlaying">
22+
<annotations>
23+
<description>Validates that the video in the video background is loaded but not playing.</description>
24+
</annotations>
25+
<assertStringNotContainsString stepKey="assertVideoPlaying">
26+
<expectedResult type="string">backface-visibility: visible;</expectedResult>
27+
<actualResult type="variable">$videoStyle</actualResult>
28+
</assertStringNotContainsString>
29+
</actionGroup>
30+
</actionGroups>

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2020 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
718
-->
819
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
920
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -19,7 +30,7 @@
1930
<waitForPageLoad stepKey="waitForPageLoad"/>
2031
<wait time="5" stepKey="waitToPreventVideoFlakiness"/>
2132
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
22-
<waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
33+
<comment userInput="BIC Change for PB Video: {{videoUrl.name}} is encrypted" stepKey="waitForVideoUrl"/>
2334
<grabAttributeFrom selector="{{section.videoBackgroundVideoElement(index)}}" userInput="style" stepKey="videoStyle"/>
2435
<assertStringContainsString stepKey="assertVideoPlaying">
2536
<expectedResult type="string">transform: translate3d(</expectedResult>

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2020 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
718
-->
819
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
920
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -32,7 +43,7 @@
3243
</assertEquals>
3344
<wait time="5" stepKey="waitToPreventVideoFlakiness"/>
3445
<waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
35-
<waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
46+
<comment userInput="BIC Change for PB Video: {{videoUrl.name}} is encrypted" stepKey="waitForVideoUrl"/>
3647
<grabAttributeFrom selector="{{section.videoBackgroundJarallaxContainer(index)}}" userInput="style" stepKey="jarallaxStyle"/>
3748
<assertStringContainsString stepKey="assertHeight">
3849
<expectedResult type="string">height: 100%;</expectedResult>

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2020 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
718
-->
819
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
920
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -30,7 +41,7 @@
3041
<wait time="5" stepKey="waitToPreventVideoFlakiness"/>
3142
<scrollToTopOfPage stepKey="scrollToTopToAvoidFlakiness" />
3243
<waitForElement selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
33-
<waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
44+
<comment userInput="BIC Change for PB Video: {{videoUrl.name}} is encrypted" stepKey="waitForVideoUrl"/>
3445
<grabAttributeFrom selector="{{section.videoBackgroundJarallaxContainer(index)}}" userInput="style" stepKey="jarallaxStyle"/>
3546
<assertStringContainsString stepKey="assertHeight">
3647
<expectedResult type="string">height: 100%;</expectedResult>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoNotAutoplayingActionGroup.xml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,27 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2020 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
718
-->
819
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
920
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1021
<actionGroup name="validateVideoNotAutoplaying" extends="validateVideoPlaying">
1122
<annotations>
1223
<description>Validates that the video content type is not autoplaying.</description>
1324
</annotations>
14-
<waitForElementVisible selector="{{page.iframeNotAutoplaying(index)}}" stepKey="seeIframePlaying"/>
25+
<waitForElementVisible selector="{{page.videoNotAutoplay(index)}}" stepKey="seeIframePlaying"/>
1526
</actionGroup>
1627
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoPlayingActionGroup.xml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2020 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
718
-->
819
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
920
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -17,9 +28,9 @@
1728
</arguments>
1829
<waitForPageLoad stepKey="waitForPageLoad"/>
1930
<waitForElementVisible selector="{{page.videoElement(index)}}" stepKey="waitForVideoVisible"/>
20-
<executeJS function="document.querySelector('[data-element=\'video\']').id = 'video-iframe'" stepKey="setIframeId"/>
21-
<switchToIFrame userInput="video-iframe" stepKey="switchToVideoIframe"/>
22-
<waitForElementVisible selector="{{page.iframePlaying(index)}}" stepKey="seeIframePlaying"/>
23-
<switchToIFrame stepKey="switchBackFromIframe"/>
31+
<comment userInput="BIC Change for PB Video: Iframe not available as video URL is changed" stepKey="setIframeId"/>
32+
<comment userInput="BIC Change for PB Video: Iframe not available as video URL is changed" stepKey="switchToVideoIframe"/>
33+
<waitForElementVisible selector="{{page.videoAutoplay(index)}}" stepKey="seeIframePlaying"/>
34+
<comment userInput="BIC Change for PB Video: Iframe not available as video URL is changed" stepKey="switchBackFromIframe"/>
2435
</actionGroup>
2536
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2018 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
718
-->
819
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
920
<!-- Background Color -->
@@ -597,22 +608,22 @@
597608
<data key="name">Video URL</data>
598609
<data key="section">background</data>
599610
<data key="fieldName">video_source</data>
600-
<data key="value">https://www.youtube.com/embed/slOtnjsbff0</data>
601-
<data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
611+
<data key="value">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
612+
<data key="renderedValue">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
602613
</entity>
603614
<entity name="PageBuilderVideoBackgroundUrl_YouTube_NonEmbedded" type="pagebuilder_video_background_url">
604615
<data key="name">Video URL</data>
605616
<data key="section">background</data>
606617
<data key="fieldName">video_source</data>
607-
<data key="value">https://www.youtube.com/watch?v=slOtnjsbff0</data>
608-
<data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
618+
<data key="value">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
619+
<data key="renderedValue">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
609620
</entity>
610621
<entity name="PageBuilderVideoBackgroundUrl_YouTube_Insecure" type="pagebuilder_video_background_url">
611622
<data key="name">Video URL</data>
612623
<data key="section">background</data>
613624
<data key="fieldName">video_source</data>
614-
<data key="value">http://www.youtube.com/watch?v=slOtnjsbff0</data>
615-
<data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
625+
<data key="value">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
626+
<data key="renderedValue">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
616627
</entity>
617628
<entity name="PageBuilderVideoBackgroundUrl_Vimeo_Embedded" type="pagebuilder_video_background_url">
618629
<data key="name">Video URL</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/VideoData.xml

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2017 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
718
-->
819

920
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -15,12 +26,19 @@
1526
<data key="fieldName">video_source</data>
1627
<data key="text">Video</data>
1728
</entity>
29+
<entity name="PageBuilderVideoUrl_Cloud" type="pagebuilder_video_url_property">
30+
<data key="name">Video URL</data>
31+
<data key="section">general</data>
32+
<data key="fieldName">video_source</data>
33+
<data key="value">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
34+
<data key="renderedValue">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
35+
</entity>
1836
<entity name="PageBuilderVideoUrl_YouTube" type="pagebuilder_video_url_property">
1937
<data key="name">Video URL</data>
2038
<data key="section">general</data>
2139
<data key="fieldName">video_source</data>
22-
<data key="value">https://www.youtube.com/embed/slOtnjsbff0</data>
23-
<data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
40+
<data key="value">https://player.vimeo.com/video/2393127</data>
41+
<data key="renderedValue">https://player.vimeo.com/video/2393127</data>
2442
</entity>
2543
<entity name="PageBuilder_InvalidVideoURL_Text" type="pagebuilder_video_url_property">
2644
<data key="name">Video URL</data>
@@ -40,8 +58,8 @@
4058
<data key="name">Video URL</data>
4159
<data key="section">general</data>
4260
<data key="fieldName">video_source</data>
43-
<data key="value">https://www.youtube.com/watch?v=slOtnjsbff0</data>
44-
<data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
61+
<data key="value">https://player.vimeo.com/video/2393127</data>
62+
<data key="renderedValue">https://player.vimeo.com/video/2393127</data>
4563
</entity>
4664
<entity name="PageBuilderVideoUrl_Empty" type="pagebuilder_video_url_property">
4765
<data key="name">Video URL</data>
@@ -54,15 +72,15 @@
5472
<data key="name">Video URL</data>
5573
<data key="section">general</data>
5674
<data key="fieldName">video_source</data>
57-
<data key="value">http://www.youtube.com/watch?v=slOtnjsbff0</data>
58-
<data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
75+
<data key="value">https://player.vimeo.com/video/2393127</data>
76+
<data key="renderedValue">https://player.vimeo.com/video/2393127</data>
5977
</entity>
6078
<entity name="PageBuilderVideoUrl_YouTube_Nocookie" type="pagebuilder_video_url_property">
6179
<data key="name">Video URL</data>
6280
<data key="section">general</data>
6381
<data key="fieldName">video_source</data>
64-
<data key="value">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
65-
<data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
82+
<data key="value">https://player.vimeo.com/video/2393127</data>
83+
<data key="renderedValue">https://player.vimeo.com/video/2393127</data>
6684
</entity>
6785
<entity name="PageBuilderVideoUrl_Vimeo_Embedded" type="pagebuilder_video_url_property">
6886
<data key="name">Video URL</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStageSection.xml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2017 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
718
-->
819
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
920
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
@@ -17,6 +28,7 @@
1728
<element name="empty" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//video" parameterized="true"/>
1829
<element name="video" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{videoIndex}}]//video" parameterized="true"/>
1930
<element name="videoAutoplay" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{videoIndex}}]//video[contains(@autoplay,'true')]" parameterized="true"/>
31+
<element name="videoNotAutoplay" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{videoIndex}}]//video[not(contains(@autoplay,'true'))]" parameterized="true"/>
2032
<element name="iframe" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//iframe" parameterized="true"/>
2133
<element name="icon" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//i[contains(@class,'icon-pagebuilder-video')]" parameterized="true"/>
2234
<element name="text" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//span[.='{{arg2}}']" parameterized="true"/>

0 commit comments

Comments
 (0)