Skip to content

Commit 67ba13d

Browse files
author
magento packaging service
committed
Version 1.7.3-p3
1 parent 94f5e14 commit 67ba13d

File tree

15 files changed

+130
-117
lines changed

15 files changed

+130
-117
lines changed

‎app/code/Magento/AwsS3PageBuilder/composer.json‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
{
22
"name": "magento/module-aws-s3-page-builder",
33
"description": "Aws S3 Page Builder module",
4+
"type": "magento2-module",
5+
"license": [
6+
"proprietary"
7+
],
8+
"version": "1.0.3",
49
"require": {
5-
"magento/framework": "*",
10+
"magento/framework": "103.0.*",
611
"php": "~8.1.0||~8.2.0"
712
},
813
"suggest": {
9-
"magento/module-page-builder": "*",
10-
"magento/module-aws-s3": "*"
14+
"magento/module-page-builder": "2.2.*",
15+
"magento/module-aws-s3": "100.4.*"
1116
},
12-
"type": "magento2-module",
13-
"license": [
14-
"proprietary"
15-
],
1617
"autoload": {
1718
"files": [
1819
"registration.php"
@@ -22,3 +23,4 @@
2223
}
2324
}
2425
}
26+

‎app/code/Magento/CatalogPageBuilderAnalytics/composer.json‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
{
22
"name": "magento/module-catalog-page-builder-analytics",
33
"description": "Catalog Page Builder Analytics module",
4+
"type": "magento2-module",
5+
"license": [
6+
"proprietary"
7+
],
48
"config": {
59
"sort-packages": true
610
},
11+
"version": "1.6.3",
712
"require": {
8-
"magento/module-page-builder-analytics": "*",
9-
"magento/module-catalog": "*",
10-
"magento/framework": "*",
13+
"magento/module-page-builder-analytics": "1.6.*",
14+
"magento/module-catalog": "104.0.*",
15+
"magento/framework": "103.0.*",
1116
"php": "~8.1.0||~8.2.0"
1217
},
13-
"type": "magento2-module",
14-
"license": [
15-
"proprietary"
16-
],
1718
"autoload": {
1819
"files": [
1920
"registration.php"
@@ -23,3 +24,4 @@
2324
}
2425
}
2526
}
27+

‎app/code/Magento/CmsPageBuilderAnalytics/composer.json‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
{
22
"name": "magento/module-cms-page-builder-analytics",
33
"description": "CMS Page Builder Analytics module",
4+
"type": "magento2-module",
5+
"license": [
6+
"proprietary"
7+
],
48
"config": {
59
"sort-packages": true
610
},
11+
"version": "1.6.3",
712
"require": {
8-
"magento/module-page-builder-analytics": "*",
9-
"magento/module-cms": "*",
10-
"magento/framework": "*",
13+
"magento/module-page-builder-analytics": "1.6.*",
14+
"magento/module-cms": "104.0.*",
15+
"magento/framework": "103.0.*",
1116
"php": "~8.1.0||~8.2.0"
1217
},
13-
"type": "magento2-module",
14-
"license": [
15-
"proprietary"
16-
],
1718
"autoload": {
1819
"files": [
1920
"registration.php"
@@ -23,3 +24,4 @@
2324
}
2425
}
2526
}
27+

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@
2323
<group value="pagebuilder-slideItemPoster"/>
2424
</annotations>
2525
<before>
26+
<magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enabledOldMediaGallery"/>
2627
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="configWYSIWYG"/>
2728
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2829
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
2930
<createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
3031
<createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
3132
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
32-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
33-
<argument name="enabled" value="0"/>
34-
</actionGroup>
3533
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
3634
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
3735
</actionGroup>
@@ -60,6 +58,7 @@
6058
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
6159
<argument name="enabled" value="1"/>
6260
</actionGroup>
61+
<magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="disabledOldMediaGallery"/>
6362
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
6463
</after>
6564
<!-- Add Slider -->

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateTabWithImageTest.xml‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@
1818
<testCaseId value="MC-5022"/>
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
21+
<group value="cloud"/>
22+
23+
<!-- TODO: pr_exclude group must be removed when AC-9371 is resolved -->
24+
<group value="pr_exclude" />
2125
</annotations>
2226
<before>
2327
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
28+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2529
<argument name="enabled" value="0"/>
2630
</actionGroup>
2731
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
@@ -39,7 +43,7 @@
3943
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
4044
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
4145
</actionGroup>
42-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
46+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
4347
<argument name="enabled" value="1"/>
4448
</actionGroup>
4549
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -73,65 +77,65 @@
7377
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusTabOptions"/>
7478
<!-- Validate Tab Item is duplicated -->
7579
<comment userInput="Validate Tab Item is duplicated" stepKey="commentValidateTabItemDuplicateOnStage"/>
76-
<seeElement selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2"/>
77-
<seeElement selector="{{TabOnStage.base('2')}}" stepKey="seeTab2"/>
80+
<waitForElementVisible selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2"/>
81+
<waitForElementVisible selector="{{TabOnStage.base('2')}}" stepKey="seeTab2"/>
7882
<!-- Duplicate Tab Group -->
7983
<comment userInput="Duplicate Tab Group" stepKey="commentDuplicateTabGroup"/>
8084
<actionGroup ref="duplicateContentType" stepKey="duplicateTabGroup">
8185
<argument name="contentType" value="PageBuilderTabsContentType"/>
8286
</actionGroup>
8387
<!-- Validate Tab Group is duplicated -->
8488
<comment userInput="Validate Tab Group is duplicated" stepKey="commentValidateTabGroupDuplicateOnStage"/>
85-
<seeElement selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup1"/>
86-
<seeElement selector="{{TabOnStage.base('3')}}" stepKey="seeTab3"/>
87-
<seeElement selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3"/>
89+
<waitForElementVisible selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup1"/>
90+
<waitForElementVisible selector="{{TabOnStage.base('3')}}" stepKey="seeTab3"/>
91+
<waitForElementVisible selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3"/>
8892
<click selector="{{TabOnStage.tabHeader('4')}}" stepKey="switchToTab4Stage"/>
8993
<waitForPageLoad stepKey="waitForPageLoad"/>
90-
<seeElement selector="{{TabOnStage.base('4')}}" stepKey="seeTab4"/>
91-
<seeElement selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4"/>
94+
<waitForElementVisible selector="{{TabOnStage.base('4')}}" stepKey="seeTab4"/>
95+
<waitForElementVisible selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4"/>
9296
<!-- Stage: Validate After Save -->
9397
<comment userInput="Stage: Validate After Save" stepKey="CommentValidateOnStageAfterSave"/>
9498
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
9599
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
96100
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
97-
<seeElement selector="{{TabsOnStage.base('1')}}" stepKey="seeTabGroup1AfterSave"/>
98-
<seeElement selector="{{TabOnStage.base('1')}}" stepKey="seeTab1AfterSave"/>
99-
<seeElement selector="{{ImageOnStage.base('1')}}" stepKey="seeImage1AfterSave"/>
101+
<waitForElementVisible selector="{{TabsOnStage.base('1')}}" stepKey="seeTabGroup1AfterSave"/>
102+
<waitForElementVisible selector="{{TabOnStage.base('1')}}" stepKey="seeTab1AfterSave"/>
103+
<waitForElementVisible selector="{{ImageOnStage.base('1')}}" stepKey="seeImage1AfterSave"/>
100104
<actionGroup ref="switchTabs" stepKey="switchToTab2StageAfterSave">
101105
<argument name="section" value="TabOnStage"/>
102106
<argument name="from" value="1"/>
103107
<argument name="to" value="2"/>
104108
</actionGroup>
105-
<seeElement selector="{{TabOnStage.base('2')}}" stepKey="seeTab2AfterSave"/>
106-
<seeElement selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2AfterSave"/>
107-
<seeElement selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup2AfterSave"/>
108-
<seeElement selector="{{TabOnStage.base('3')}}" stepKey="seeTab3AfterSave"/>
109-
<seeElement selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3AfterSave"/>
109+
<waitForElementVisible selector="{{TabOnStage.base('2')}}" stepKey="seeTab2AfterSave"/>
110+
<waitForElementVisible selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2AfterSave"/>
111+
<waitForElementVisible selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup2AfterSave"/>
112+
<waitForElementVisible selector="{{TabOnStage.base('3')}}" stepKey="seeTab3AfterSave"/>
113+
<waitForElementVisible selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3AfterSave"/>
110114
<click selector="{{TabOnStage.tabHeader('4')}}" stepKey="switchToTab4StageAfterSave"/>
111115
<waitForPageLoad stepKey="waitForPageLoad2"/>
112-
<seeElement selector="{{TabOnStage.base('4')}}" stepKey="seeTab4AfterSave"/>
113-
<seeElement selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4AfterSave"/>
116+
<waitForElementVisible selector="{{TabOnStage.base('4')}}" stepKey="seeTab4AfterSave"/>
117+
<waitForElementVisible selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4AfterSave"/>
114118
<!-- Validate content type is duplicated in Storefront -->
115119
<comment userInput="Validate content type is duplicated in Storefront" stepKey="commentValidateDuplicatedStorefront"/>
116120
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
117121
<argument name="contentType" value="PageBuilderImageContentType"/>
118122
</actionGroup>
119-
<seeElement selector="{{TabsOnFrontend.base('1')}}" stepKey="seeTabGroup1Storefront"/>
120-
<seeElement selector="{{TabOnStorefront.base('1')}}" stepKey="seeTab1Storefront"/>
121-
<seeElement selector="{{ImageOnStorefront.base('1')}}" stepKey="seeImage1Storefront"/>
123+
<waitForElementVisible selector="{{TabsOnFrontend.base('1')}}" stepKey="seeTabGroup1Storefront"/>
124+
<waitForElementVisible selector="{{TabOnStorefront.base('1')}}" stepKey="seeTab1Storefront"/>
125+
<waitForElementVisible selector="{{ImageOnStorefront.base('1')}}" stepKey="seeImage1Storefront"/>
122126
<actionGroup ref="switchTabs" stepKey="switchToTab2Storefront">
123127
<argument name="section" value="TabOnStorefront"/>
124128
<argument name="from" value="1"/>
125129
<argument name="to" value="2"/>
126130
</actionGroup>
127-
<seeElement selector="{{TabOnStorefront.base('2')}}" stepKey="seeTab2Storefront"/>
128-
<seeElement selector="{{ImageOnStorefront.base('2')}}" stepKey="seeImage2Storefront"/>
129-
<seeElement selector="{{TabsOnFrontend.base('2')}}" stepKey="seeTabGroup2Storefront"/>
130-
<seeElement selector="{{TabOnStorefront.base('3')}}" stepKey="seeTab3Storefront"/>
131-
<seeElement selector="{{ImageOnStorefront.base('3')}}" stepKey="seeImage3Storefront"/>
131+
<waitForElementVisible selector="{{TabOnStorefront.base('2')}}" stepKey="seeTab2Storefront"/>
132+
<waitForElementVisible selector="{{ImageOnStorefront.base('2')}}" stepKey="seeImage2Storefront"/>
133+
<waitForElementVisible selector="{{TabsOnFrontend.base('2')}}" stepKey="seeTabGroup2Storefront"/>
134+
<waitForElementVisible selector="{{TabOnStorefront.base('3')}}" stepKey="seeTab3Storefront"/>
135+
<waitForElementVisible selector="{{ImageOnStorefront.base('3')}}" stepKey="seeImage3Storefront"/>
132136
<click selector="{{TabOnStorefront.tabHeader('4')}}" stepKey="switchToTab4Storefront"/>
133137
<waitForPageLoad stepKey="waitForPageLoad3"/>
134-
<seeElement selector="{{TabOnStorefront.base('4')}}" stepKey="seeTab4Storefront"/>
135-
<seeElement selector="{{ImageOnStorefront.base('4')}}" stepKey="seeImage4Storefront"/>
138+
<waitForElementVisible selector="{{TabOnStorefront.base('4')}}" stepKey="seeTab4Storefront"/>
139+
<waitForElementVisible selector="{{ImageOnStorefront.base('4')}}" stepKey="seeImage4Storefront"/>
136140
</test>
137141
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToColumnOnStageTextTest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@
2020
<group value="pagebuilder-column-content"/>
2121
</annotations>
2222
<before>
23+
2324
<createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
2425
<createData entity="_defaultCmsPage" stepKey="createCMSPageB"/>
2526
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
26-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
27-
<argument name="enabled" value="0"/>
28-
</actionGroup>
27+
<magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enabledOldMediaGallery"/>
2928
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE"/>
3029
</before>
3130
<after>
@@ -46,6 +45,7 @@
4645
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
4746
<argument name="enabled" value="1"/>
4847
</actionGroup>
48+
<magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="disabledOldMediaGallery"/>
4949
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5050
</after>
5151
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineImageEditingTest.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
<group value="pagebuilder-text"/>
2121
</annotations>
2222
<before>
23+
<magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enabledOldMediaGallery"/>
2324
<createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
2425
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26-
<argument name="enabled" value="0"/>
27-
</actionGroup>
2826
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2927
<magentoCLI command="config:set cms/wysiwyg/use_static_urls_in_catalog 1" stepKey="useStaticURLForMediaContentInWYSIWYG"/>
3028
</before>
@@ -45,6 +43,7 @@
4543
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
4644
<argument name="enabled" value="1"/>
4745
</actionGroup>
46+
<magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="disabledOldMediaGallery"/>
4847
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4948
</after>
5049
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerUploadImageFromStageTest.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
<before>
2323
<createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26-
<argument name="enabled" value="0"/>
27-
</actionGroup>
2825
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
2926
<argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
3027
</actionGroup>
@@ -37,6 +34,7 @@
3734
<argument name="viewportButton" value="mobile"/>
3835
<argument name="viewportStage" value="mobile"/>
3936
</actionGroup>
37+
<magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enabledOldMediaGallery"/>
4038
</before>
4139
<after>
4240
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
@@ -51,6 +49,7 @@
5149
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
5250
<argument name="enabled" value="1"/>
5351
</actionGroup>
52+
<magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enabledOldMediaGallery"/>
5453
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5554
</after>
5655
<!-- Add Banner -->

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemUploadImageFromStageTest.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
<group value="pagebuilder-viewport-switcher"/>
2121
</annotations>
2222
<before>
23+
<magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="enabledOldMediaGallery"/>
2324
<createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
2425
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26-
<argument name="enabled" value="0"/>
27-
</actionGroup>
2826
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
2927
<argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
3028
</actionGroup>
@@ -51,6 +49,7 @@
5149
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
5250
<argument name="enabled" value="1"/>
5351
</actionGroup>
52+
<magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="disabledOldMediaGallery"/>
5453
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5554
</after>
5655
<!-- Add Slider -->

0 commit comments

Comments
 (0)