Skip to content

Commit 3b7b0c5

Browse files
authored
Merge pull request #197 from magento-gl/GL_Arrows_Dec14_2022
Arrows Team - Bugfix delivery
2 parents 1b31914 + 50d1372 commit 3b7b0c5

File tree

143 files changed

+858
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+858
-0
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryDirectivesTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<createData entity="simpleCmsPage" stepKey="createCMSPageA"/>
2727
<createData entity="simpleCmsPage" stepKey="createCMSPageB"/>
2828
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
29+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
30+
<argument name="enabled" value="0"/>
31+
</actionGroup>
2932
<actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="navigateToCreatedProductEditPage">
3033
<argument name="Category" value="$$createPreReqCategory$$"/>
3134
</actionGroup>
@@ -43,6 +46,9 @@
4346
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
4447
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
4548
</actionGroup>
49+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
50+
<argument name="enabled" value="1"/>
51+
</actionGroup>
4652
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4753
</after>
4854
<actionGroup ref="openPageBuilderForAttribute" stepKey="enablePageBuilderOnCatalog"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductDirectivesTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
<createData entity="simpleCmsPage" stepKey="createCMSPageA"/>
3030
<createData entity="simpleCmsPage" stepKey="createCMSPageB"/>
3131
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
32+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
33+
<argument name="enabled" value="0"/>
34+
</actionGroup>
3235
</before>
3336
<after>
3437
<magentoCLI command="config:set general/store_information/country_id none" stepKey="setBackToDefaultValue"/>
@@ -43,6 +46,9 @@
4346
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
4447
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
4548
</actionGroup>
49+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
50+
<argument name="enabled" value="1"/>
51+
</actionGroup>
4652
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4753
</after>
4854
<!--Go to Product Page-->

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentFixedTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
</annotations>
2323
<before>
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<argument name="enabled" value="0"/>
27+
</actionGroup>
2528
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2629
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2730
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -38,6 +41,9 @@
3841
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
3942
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
4043
</actionGroup>
44+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
45+
<argument name="enabled" value="1"/>
46+
</actionGroup>
4147
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4248
</after>
4349
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentScrollTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
</annotations>
2323
<before>
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<argument name="enabled" value="0"/>
27+
</actionGroup>
2528
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2629
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2730
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +40,9 @@
3740
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
3841
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
3942
</actionGroup>
43+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
44+
<argument name="enabled" value="1"/>
45+
</actionGroup>
4046
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4147
</after>
4248
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageGIFTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
</annotations>
2323
<before>
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<argument name="enabled" value="0"/>
27+
</actionGroup>
2528
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2629
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2730
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +40,9 @@
3740
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
3841
<argument name="Image" value="PageBuilderBackgroundImage_GIF"/>
3942
</actionGroup>
43+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
44+
<argument name="enabled" value="1"/>
45+
</actionGroup>
4046
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4147
</after>
4248
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidFileSizeTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
</annotations>
2323
<before>
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<argument name="enabled" value="0"/>
27+
</actionGroup>
2528
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2629
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2730
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -38,6 +41,9 @@
3841
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
3942
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
4043
</actionGroup>
44+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
45+
<argument name="enabled" value="1"/>
46+
</actionGroup>
4147
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4248
</after>
4349
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidFileTypeTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
</annotations>
2323
<before>
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<argument name="enabled" value="0"/>
27+
</actionGroup>
2528
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2629
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2730
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +40,9 @@
3740
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
3841
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
3942
</actionGroup>
43+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
44+
<argument name="enabled" value="1"/>
45+
</actionGroup>
4046
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4147
</after>
4248
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageJPGTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
</annotations>
2323
<before>
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<argument name="enabled" value="0"/>
27+
</actionGroup>
2528
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2629
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2730
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +40,9 @@
3740
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
3841
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
3942
</actionGroup>
43+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
44+
<argument name="enabled" value="1"/>
45+
</actionGroup>
4046
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4147
</after>
4248
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImagePNGTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
</annotations>
2323
<before>
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<argument name="enabled" value="0"/>
27+
</actionGroup>
2528
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2629
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2730
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +40,9 @@
3740
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
3841
<argument name="Image" value="PageBuilderBackgroundImage_PNG"/>
3942
</actionGroup>
43+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
44+
<argument name="enabled" value="1"/>
45+
</actionGroup>
4046
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4147
</after>
4248
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageSelectFromGalleryJPGTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
</annotations>
2323
<before>
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<argument name="enabled" value="0"/>
27+
</actionGroup>
2528
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2629
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2730
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -42,6 +45,9 @@
4245
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
4346
<argument name="Image" value="{{ImageFolder.name}}"/>
4447
</actionGroup>
48+
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
49+
<argument name="enabled" value="1"/>
50+
</actionGroup>
4551
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4652
</after>
4753
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">

0 commit comments

Comments
 (0)