Skip to content

Commit 77eeaef

Browse files
abukatarabukatar
committed
Merge branch 'develop' of https://github.com/adobe-commerce-tier-4/magento2-page-builder into PR-03-12-2024-anna
2 parents 20762f5 + 4a2795e commit 77eeaef

File tree

17 files changed

+67
-12
lines changed

17 files changed

+67
-12
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<arguments>
1212
<argument name="property"/>
1313
</arguments>
14-
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
14+
<waitForElement selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
1515
<see userInput="{{property.name}}" selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
1616
<seeElementInDOM selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="seePropertyControl"/>
1717
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup">
11+
<arguments>
12+
<argument name="property"/>
13+
</arguments>
14+
<waitForElementVisible time="2" selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForPropertyElement"/>
15+
<dontSeeElement selector="{{EditPanelForm.panelFieldRequired(property.section, property.fieldName)}}" stepKey="seePropertyIsNotARequiredField"/>
16+
</actionGroup>
17+
</actionGroups>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@
5757
<data key="value">http://www.youtube.com/watch?v=slOtnjsbff0</data>
5858
<data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
5959
</entity>
60+
<entity name="PageBuilderVideoUrl_YouTube_Nocookie" type="pagebuilder_video_url_property">
61+
<data key="name">Video URL</data>
62+
<data key="section">general</data>
63+
<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>
66+
</entity>
6067
<entity name="PageBuilderVideoUrl_Vimeo_Embedded" type="pagebuilder_video_url_property">
6168
<data key="name">Video URL</data>
6269
<data key="section">general</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnNoRequiredTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundColorProperty">
4646
<argument name="property" value="PageBuilderBackgroundColorProperty"/>
4747
</actionGroup>
48-
<actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundImageProperty">
48+
<actionGroup ref="validateSlideOutPanelFieldWithUploaderId" stepKey="seeBackgroundImageProperty">
4949
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
5050
</actionGroup>
5151
<actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundPositionProperty">
@@ -66,7 +66,7 @@
6666
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundColorNotRequired">
6767
<argument name="property" value="PageBuilderBackgroundColorProperty"/>
6868
</actionGroup>
69-
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundImageIsRequired">
69+
<actionGroup ref="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup" stepKey="seeBackgroundImageIsRequired">
7070
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
7171
</actionGroup>
7272
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundPositionNotRequired">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundSectionDefaultValues.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@
8787
<actionGroup ref="seeNoImageUploadedOnSlideOut" stepKey="validateNoFallbackImage">
8888
<argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
8989
</actionGroup>
90-
<actionGroup ref="validateSlideOutPanelFieldTooltip" stepKey="validateTooltipFallbackImage">
90+
<actionGroup ref="validateSlideOutPanelFieldTooltipWithUploaderId" stepKey="validateTooltipFallbackImage">
9191
<argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
9292
</actionGroup>
93-
<actionGroup ref="validateSlideOutPanelFieldHelperText" stepKey="validateHelperTextFallbackImage">
93+
<actionGroup ref="validateSlideOutPanelFieldHelperTextWithUploaderId" stepKey="validateHelperTextFallbackImage">
9494
<argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
9595
</actionGroup>
9696
</test>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowNoRequiredAttributesTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundColor">
4343
<argument name="property" value="PageBuilderBackgroundColor_Default"/>
4444
</actionGroup>
45-
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundImage">
45+
<actionGroup ref="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup" stepKey="validateBackgroundImage">
4646
<argument name="property" value="PageBuilderBackgroundImage_Default"/>
4747
</actionGroup>
4848
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundPosition">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateURLTest.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,18 @@
9191
<argument name="page" value="VideoOnStage"/>
9292
<argument name="url" value="PageBuilderVideoUrl_YouTube_Insecure"/>
9393
</actionGroup>
94+
<!-- Update to YouTube Nocookie -->
95+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageYouTubeNocookie">
96+
<argument name="contentType" value="PageBuilderVideoContentType"/>
97+
</actionGroup>
98+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterVideoUrlYouTubeNocookie">
99+
<argument name="property" value="PageBuilderVideoUrl_YouTube_Nocookie"/>
100+
</actionGroup>
101+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsNocookie"/>
102+
<actionGroup ref="validateVideoWithOnlyVideoUrl" stepKey="validateYouTubeNocookieStage">
103+
<argument name="page" value="VideoOnStage"/>
104+
<argument name="url" value="PageBuilderVideoUrl_YouTube_Nocookie"/>
105+
</actionGroup>
94106
<!-- Update to Vimeo Embedded-->
95107
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageVimeoEmbedded">
96108
<argument name="contentType" value="PageBuilderVideoContentType"/>

‎app/code/Magento/PageBuilder/etc/di.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@
363363
<arguments>
364364
<argument name="allowedHosts" xsi:type="array">
365365
<item name="youtube" xsi:type="string">youtube.com</item>
366+
<item name="youtube-nocookie" xsi:type="string">youtube-nocookie.com</item>
366367
<item name="vimeo" xsi:type="string">vimeo.com</item>
367368
</argument>
368369
</arguments>

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/converter/attribute/src.js

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/converter/attribute/videosrc.js

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)