Skip to content

Commit 33ce2eb

Browse files
pawan-adobe-securitypawan-adobe-security
authored
Merge pull request #332 from magento-cia/cia-pre-release-develop-sync-05212024
Cia pre release develop sync 05212024
2 parents 8706d60 + 36c0f5d commit 33ce2eb

File tree

33 files changed

+702
-54
lines changed

33 files changed

+702
-54
lines changed

‎.github/.metadata.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"templateVersion": "0.1",
2+
"templateVersion": "0.2",
33
"product": {
44
"name": "Magento 2 Page Builder",
55
"description": "Page Builder introduces an intuitive, drag-and-drop interface for creating digital content, powered by content types like images, videos, banners, etc. with instant preview capabilities that enable non-technical users to take control of their content."
66
},
77
"contacts": {
88
"team": {
9-
"name": "Amigos",
10-
"DL": "Grp-amigos",
11-
"slackChannel": "team-amigos"
9+
"name": "Bluetooth",
10+
"DL": "Grp-RQ-BLUETOOTH",
11+
"slackChannel": ""
1212
}
1313
},
1414
"ticketTracker": {
1515
"functionalJiraQueue": {
16-
"projectKey": "PB",
16+
"projectKey": "AC",
1717
"component": ""
1818
},
1919
"securityJiraQueue": {

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml ‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageContentTypeToCMSPageAwsS3Test.xml

File renamed without changes.

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

+1-1
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

+17
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/ActionGroup/WYSIWYGActionGroup/AdminOpenInsertWidgetSlideOutActionGroup.xml ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminClickInsertWidgetButtonInInlineTinyMCEEditorActionGroup.xml

File renamed without changes.

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTextActionGroup.xml ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/clickOutsideTextInlineEditingActionGroup.xml

File renamed without changes.

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

+7
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/Section/PageBuilderStoreConfigurationSection.xml ‎app/code/Magento/PageBuilder/Test/Mftf/Section/ContentManagementSection.xml

File renamed without changes.

‎app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderSuite.xml ‎app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderWithWYSIWYGSuite.xml

File renamed without changes.

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithImageTest.xml ‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreatePageWithImageTest.xml

File renamed without changes.

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

+2-2
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/AdminPageBuilderCommonTest/AdminPageBuilderPageButtonLinkTest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
<waitForElementVisible selector="{{PageBuilderLinkAttributeAdmin.LinkItemSelected($createCMSPageA.title$)}}" stepKey="seeSearchResultHighlighted"/>
8181

8282
<!--Select another page from dropdown-->
83+
<scrollTo selector="{{PageBuilderLinkAttributeAdmin.LinkItemSelected($createCMSPageA.title$)}}" stepKey="scrollToLinks"/>
8384
<waitForElementClickable selector="{{PageBuilderLinkAttributeAdmin.LinkItemSelected($createCMSPageA.title$)}}" stepKey="waitForCMSPageBClickable"/>
8485
<click selector="{{PageBuilderLinkAttributeAdmin.SearchResult($createCMSPageB.title$)}}" stepKey="clickCMSPageBOnSearchResult"/>
8586
<grabTextFrom selector="{{PageBuilderLinkAttributeAdmin.DropdownInput}}" stepKey="textFromDropDown2"/>

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

+2-2
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

+1-1
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/AdminPageBuilderTextTest/TextDataConsistencyBetweenTextEditorTestWithoutTinyMCETest.xml ‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDataConsistencyBetweenTextEditorWithoutTinyMCETest.xml

File renamed without changes.

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

+12
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/Test/Mftf/Test/AdminStoreConfigurationPageBuilderProductMetadescriptionMask.xml ‎app/code/Magento/PageBuilder/Test/Mftf/Test/ProductMetaDescriptionMaskTest.xml

File renamed without changes.

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderEnableTest.xml ‎app/code/Magento/PageBuilder/Test/Mftf/Test/VerifyPageBuilderSwitcherAndDisclaimerMessageTest.xml

File renamed without changes.

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherButtonsThroughBlockContentTypeStackedNotSameSizeTest.xml ‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileButtonsThroughBlockContentTypeStackedNotSameSizeTest.xml

File renamed without changes.

0 commit comments

Comments
 (0)