cia-2.4.8-beta1-develop-bugfix-08272024 - resolve conflict

pawan-adobe-security · pawan-adobe-security · commit d99fb20aa96a · 2024-08-27T21:14:53.000+05:30
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundVideoURLs.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundVideoURLs.xml
@@ -21,6 +21,9 @@
             <group value="pagebuilder-backgroundForm"/>
             <group value="pagebuilder-video-background"/>
             <group value="pr_exclude"/>
+            <skip>
+                <issueId value="AC-12669"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundVideoURLs.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundVideoURLs.xml
@@ -20,6 +20,10 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowBackground"/>
             <group value="pagebuilder-video-background"/>
+            <skip>
+                <issueId value="AC-12669"/>
+            </skip>
+
             <group value="pr_exclude"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundVideoURLs.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundVideoURLs.xml
@@ -20,6 +20,9 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
             <group value="pagebuilder-video-background"/>
+            <skip>
+                <issueId value="AC-12669"/>
+            </skip>
             <group value="pr_exclude"/>
         </annotations>
         <before>
