Merge branch 'develop' into develop

Author: engcom-Hotel

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

@@ -11,7 +11,7 @@
         <arguments>
             <argument name="property"/>
         </arguments>
-        <waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
+        <waitForElement selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
         <see userInput="{{property.name}}" selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
         <seeElementInDOM selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="seePropertyControl"/>
     </actionGroup>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+  <actionGroup name="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup">
+    <arguments>
+      <argument name="property"/>
+    </arguments>
+    <waitForElementVisible time="2" selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForPropertyElement"/>
+    <dontSeeElement selector="{{EditPanelForm.panelFieldRequired(property.section, property.fieldName)}}" stepKey="seePropertyIsNotARequiredField"/>
+  </actionGroup>
+</actionGroups>

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

@@ -57,6 +57,13 @@
         <data key="value">http://www.youtube.com/watch?v=slOtnjsbff0</data>
         <data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
     </entity>
+    <entity name="PageBuilderVideoUrl_YouTube_Nocookie" type="pagebuilder_video_url_property">
+        <data key="name">Video URL</data>
+        <data key="section">general</data>
+        <data key="fieldName">video_source</data>
+        <data key="value">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
+        <data key="renderedValue">https://www.youtube-nocookie.com/embed/slOtnjsbff0</data>
+    </entity>
     <entity name="PageBuilderVideoUrl_Vimeo_Embedded" type="pagebuilder_video_url_property">
         <data key="name">Video URL</data>
         <data key="section">general</data>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminOpenInsertWidgetSlideOutActionGroup.xml renamed to app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminClickInsertWidgetButtonInInlineTinyMCEEditorActionGroup.xml

@@ -45,7 +45,7 @@
         <actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundColorProperty">
             <argument name="property" value="PageBuilderBackgroundColorProperty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundImageProperty">
+        <actionGroup ref="validateSlideOutPanelFieldWithUploaderId" stepKey="seeBackgroundImageProperty">
             <argument name="property" value="PageBuilderBackgroundImage_JPG"/>
         </actionGroup>
         <actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundPositionProperty">
@@ -66,7 +66,7 @@
         <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundColorNotRequired">
             <argument name="property" value="PageBuilderBackgroundColorProperty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundImageIsRequired">
+        <actionGroup ref="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup" stepKey="seeBackgroundImageIsRequired">
             <argument name="property" value="PageBuilderBackgroundImage_JPG"/>
         </actionGroup>
         <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundPositionNotRequired">