Version 1.7.3-p3

magento · Oct 5, 2023 · 67ba13d · 67ba13d
1 parent 94f5e14
commit 67ba13d
Show file tree

Hide file tree

Showing 15 changed files with 130 additions and 117 deletions.
diff --git a/app/code/Magento/AwsS3PageBuilder/composer.json b/app/code/Magento/AwsS3PageBuilder/composer.json
@@ -1,18 +1,19 @@
 {
     "name": "magento/module-aws-s3-page-builder",
     "description": "Aws S3 Page Builder module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
+    "version": "1.0.3",
     "require": {
-        "magento/framework": "*",
+        "magento/framework": "103.0.*",
         "php": "~8.1.0||~8.2.0"
     },
     "suggest": {
-        "magento/module-page-builder": "*",
-        "magento/module-aws-s3": "*"
+        "magento/module-page-builder": "2.2.*",
+        "magento/module-aws-s3": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogPageBuilderAnalytics/composer.json b/app/code/Magento/CatalogPageBuilderAnalytics/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-catalog-page-builder-analytics",
     "description": "Catalog Page Builder Analytics module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "1.6.3",
     "require": {
-        "magento/module-page-builder-analytics": "*",
-        "magento/module-catalog": "*",
-        "magento/framework": "*",
+        "magento/module-page-builder-analytics": "1.6.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/framework": "103.0.*",
         "php": "~8.1.0||~8.2.0"
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CmsPageBuilderAnalytics/composer.json b/app/code/Magento/CmsPageBuilderAnalytics/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-cms-page-builder-analytics",
     "description": "CMS Page Builder Analytics module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "1.6.3",
     "require": {
-        "magento/module-page-builder-analytics": "*",
-        "magento/module-cms": "*",
-        "magento/framework": "*",
+        "magento/module-page-builder-analytics": "1.6.*",
+        "magento/module-cms": "104.0.*",
+        "magento/framework": "103.0.*",
         "php": "~8.1.0||~8.2.0"
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/...pesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml b/...pesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml
@@ -23,15 +23,13 @@
             <group value="pagebuilder-slideItemPoster"/>
         </annotations>
         <before>
+	    <magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enabledOldMediaGallery"/>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="configWYSIWYG"/>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
-                <argument name="enabled" value="0"/>
-            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -60,6 +58,7 @@
             <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
                 <argument name="enabled" value="1"/>
             </actionGroup>
+	    <magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="disabledOldMediaGallery"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider -->

diff --git a/...agento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateTabWithImageTest.xml b/...agento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateTabWithImageTest.xml
@@ -18,10 +18,14 @@
             <testCaseId value="MC-5022"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
+            <group value="cloud"/>
+
+            <!--  TODO: pr_exclude group must be removed when AC-9371 is resolved  -->
+            <group value="pr_exclude" />
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
                 <argument name="enabled" value="0"/>
             </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
@@ -39,7 +43,7 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
             </actionGroup>
-            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
                 <argument name="enabled" value="1"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -73,65 +77,65 @@
         <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusTabOptions"/>
         <!-- Validate Tab Item is duplicated -->
         <comment userInput="Validate Tab Item is duplicated" stepKey="commentValidateTabItemDuplicateOnStage"/>
-        <seeElement selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2"/>
-        <seeElement selector="{{TabOnStage.base('2')}}" stepKey="seeTab2"/>
+        <waitForElementVisible selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2"/>
+        <waitForElementVisible selector="{{TabOnStage.base('2')}}" stepKey="seeTab2"/>
         <!-- Duplicate Tab Group -->
         <comment userInput="Duplicate Tab Group" stepKey="commentDuplicateTabGroup"/>
         <actionGroup ref="duplicateContentType" stepKey="duplicateTabGroup">
             <argument name="contentType" value="PageBuilderTabsContentType"/>
         </actionGroup>
         <!-- Validate Tab Group is duplicated -->
         <comment userInput="Validate Tab Group is duplicated" stepKey="commentValidateTabGroupDuplicateOnStage"/>
-        <seeElement selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup1"/>
-        <seeElement selector="{{TabOnStage.base('3')}}" stepKey="seeTab3"/>
-        <seeElement selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3"/>
+        <waitForElementVisible selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup1"/>
+        <waitForElementVisible selector="{{TabOnStage.base('3')}}" stepKey="seeTab3"/>
+        <waitForElementVisible selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3"/>
         <click selector="{{TabOnStage.tabHeader('4')}}" stepKey="switchToTab4Stage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <seeElement selector="{{TabOnStage.base('4')}}" stepKey="seeTab4"/>
-        <seeElement selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4"/>
+        <waitForElementVisible selector="{{TabOnStage.base('4')}}" stepKey="seeTab4"/>
+        <waitForElementVisible selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4"/>
         <!-- Stage: Validate After Save -->
         <comment userInput="Stage: Validate After Save" stepKey="CommentValidateOnStageAfterSave"/>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
-        <seeElement selector="{{TabsOnStage.base('1')}}" stepKey="seeTabGroup1AfterSave"/>
-        <seeElement selector="{{TabOnStage.base('1')}}" stepKey="seeTab1AfterSave"/>
-        <seeElement selector="{{ImageOnStage.base('1')}}" stepKey="seeImage1AfterSave"/>
+        <waitForElementVisible selector="{{TabsOnStage.base('1')}}" stepKey="seeTabGroup1AfterSave"/>
+        <waitForElementVisible selector="{{TabOnStage.base('1')}}" stepKey="seeTab1AfterSave"/>
+        <waitForElementVisible selector="{{ImageOnStage.base('1')}}" stepKey="seeImage1AfterSave"/>
         <actionGroup ref="switchTabs" stepKey="switchToTab2StageAfterSave">
             <argument name="section" value="TabOnStage"/>
             <argument name="from" value="1"/>
             <argument name="to" value="2"/>
         </actionGroup>
-        <seeElement selector="{{TabOnStage.base('2')}}" stepKey="seeTab2AfterSave"/>
-        <seeElement selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2AfterSave"/>
-        <seeElement selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup2AfterSave"/>
-        <seeElement selector="{{TabOnStage.base('3')}}" stepKey="seeTab3AfterSave"/>
-        <seeElement selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3AfterSave"/>
+        <waitForElementVisible selector="{{TabOnStage.base('2')}}" stepKey="seeTab2AfterSave"/>
+        <waitForElementVisible selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2AfterSave"/>
+        <waitForElementVisible selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup2AfterSave"/>
+        <waitForElementVisible selector="{{TabOnStage.base('3')}}" stepKey="seeTab3AfterSave"/>
+        <waitForElementVisible selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3AfterSave"/>
         <click selector="{{TabOnStage.tabHeader('4')}}" stepKey="switchToTab4StageAfterSave"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
-        <seeElement selector="{{TabOnStage.base('4')}}" stepKey="seeTab4AfterSave"/>
-        <seeElement selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4AfterSave"/>
+        <waitForElementVisible selector="{{TabOnStage.base('4')}}" stepKey="seeTab4AfterSave"/>
+        <waitForElementVisible selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4AfterSave"/>
         <!-- Validate content type is duplicated in Storefront -->
         <comment userInput="Validate content type is duplicated in Storefront" stepKey="commentValidateDuplicatedStorefront"/>
         <actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
             <argument name="contentType" value="PageBuilderImageContentType"/>
         </actionGroup>
-        <seeElement selector="{{TabsOnFrontend.base('1')}}" stepKey="seeTabGroup1Storefront"/>
-        <seeElement selector="{{TabOnStorefront.base('1')}}" stepKey="seeTab1Storefront"/>
-        <seeElement selector="{{ImageOnStorefront.base('1')}}" stepKey="seeImage1Storefront"/>
+        <waitForElementVisible selector="{{TabsOnFrontend.base('1')}}" stepKey="seeTabGroup1Storefront"/>
+        <waitForElementVisible selector="{{TabOnStorefront.base('1')}}" stepKey="seeTab1Storefront"/>
+        <waitForElementVisible selector="{{ImageOnStorefront.base('1')}}" stepKey="seeImage1Storefront"/>
         <actionGroup ref="switchTabs" stepKey="switchToTab2Storefront">
             <argument name="section" value="TabOnStorefront"/>
             <argument name="from" value="1"/>
             <argument name="to" value="2"/>
         </actionGroup>
-        <seeElement selector="{{TabOnStorefront.base('2')}}" stepKey="seeTab2Storefront"/>
-        <seeElement selector="{{ImageOnStorefront.base('2')}}" stepKey="seeImage2Storefront"/>
-        <seeElement selector="{{TabsOnFrontend.base('2')}}" stepKey="seeTabGroup2Storefront"/>
-        <seeElement selector="{{TabOnStorefront.base('3')}}" stepKey="seeTab3Storefront"/>
-        <seeElement selector="{{ImageOnStorefront.base('3')}}" stepKey="seeImage3Storefront"/>
+        <waitForElementVisible selector="{{TabOnStorefront.base('2')}}" stepKey="seeTab2Storefront"/>
+        <waitForElementVisible selector="{{ImageOnStorefront.base('2')}}" stepKey="seeImage2Storefront"/>
+        <waitForElementVisible selector="{{TabsOnFrontend.base('2')}}" stepKey="seeTabGroup2Storefront"/>
+        <waitForElementVisible selector="{{TabOnStorefront.base('3')}}" stepKey="seeTab3Storefront"/>
+        <waitForElementVisible selector="{{ImageOnStorefront.base('3')}}" stepKey="seeImage3Storefront"/>
         <click selector="{{TabOnStorefront.tabHeader('4')}}" stepKey="switchToTab4Storefront"/>
         <waitForPageLoad stepKey="waitForPageLoad3"/>
-        <seeElement selector="{{TabOnStorefront.base('4')}}" stepKey="seeTab4Storefront"/>
-        <seeElement selector="{{ImageOnStorefront.base('4')}}" stepKey="seeImage4Storefront"/>
+        <waitForElementVisible selector="{{TabOnStorefront.base('4')}}" stepKey="seeTab4Storefront"/>
+        <waitForElementVisible selector="{{ImageOnStorefront.base('4')}}" stepKey="seeImage4Storefront"/>
     </test>
 </tests>
diff --git a/...t/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToColumnOnStageTextTest.xml b/...t/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToColumnOnStageTextTest.xml
@@ -20,12 +20,11 @@
             <group value="pagebuilder-column-content"/>
         </annotations>
         <before>
+
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
             <createData entity="_defaultCmsPage" stepKey="createCMSPageB"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
-                <argument name="enabled" value="0"/>
-            </actionGroup>
+          	 <magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enabledOldMediaGallery"/>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE"/>
         </before>
         <after>
@@ -46,6 +45,7 @@
             <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
                 <argument name="enabled" value="1"/>
             </actionGroup>
+             <magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="disabledOldMediaGallery"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">

diff --git a/...agento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineImageEditingTest.xml b/...agento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineImageEditingTest.xml
@@ -20,11 +20,9 @@
             <group value="pagebuilder-text"/>
         </annotations>
         <before>
+            <magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enabledOldMediaGallery"/>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
-                <argument name="enabled" value="0"/>
-            </actionGroup>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
             <magentoCLI command="config:set cms/wysiwyg/use_static_urls_in_catalog 1" stepKey="useStaticURLForMediaContentInWYSIWYG"/>
         </before>
@@ -45,6 +43,7 @@
             <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
                 <argument name="enabled" value="1"/>
             </actionGroup>
+	    <magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="disabledOldMediaGallery"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">

diff --git a/...Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerUploadImageFromStageTest.xml b/...Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerUploadImageFromStageTest.xml
@@ -22,9 +22,6 @@
         <before>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
-                <argument name="enabled" value="0"/>
-            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
                 <argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
             </actionGroup>
@@ -37,6 +34,7 @@
                 <argument name="viewportButton" value="mobile"/>
                 <argument name="viewportStage" value="mobile"/>
             </actionGroup>
+            <magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enabledOldMediaGallery"/>
         </before>
         <after>
             <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
@@ -51,6 +49,7 @@
             <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
                 <argument name="enabled" value="1"/>
             </actionGroup>
+         	  <magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enabledOldMediaGallery"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Banner -->

diff --git a/...f/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemUploadImageFromStageTest.xml b/...f/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemUploadImageFromStageTest.xml
@@ -20,11 +20,9 @@
             <group value="pagebuilder-viewport-switcher"/>
         </annotations>
         <before>
+            <magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enabledOldMediaGallery"/>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
-                <argument name="enabled" value="0"/>
-            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
                 <argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
             </actionGroup>
@@ -51,6 +49,7 @@
             <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
                 <argument name="enabled" value="1"/>
             </actionGroup>
+            <magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="disabledOldMediaGallery"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider -->