Skip to content

Commit e1f1113

Browse files
committed
ACQE-5377: [Stabilithon] Review and deliver submitted Pull Requests
1 parent eee6453 commit e1f1113

File tree

143 files changed

+292
-289
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

+292
-289
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<createData entity="simpleCmsPage" stepKey="createCMSPageA"/>
2727
<createData entity="simpleCmsPage" stepKey="createCMSPageB"/>
2828
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
29-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
29+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
3030
<argument name="enabled" value="0"/>
3131
</actionGroup>
3232
<actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="navigateToCreatedProductEditPage">
@@ -46,7 +46,7 @@
4646
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
4747
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
4848
</actionGroup>
49-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
49+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
5050
<argument name="enabled" value="1"/>
5151
</actionGroup>
5252
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<createData entity="simpleCmsPage" stepKey="createCMSPageA"/>
3030
<createData entity="simpleCmsPage" stepKey="createCMSPageB"/>
3131
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
32-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
32+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
3333
<argument name="enabled" value="0"/>
3434
</actionGroup>
3535
</before>
@@ -46,7 +46,7 @@
4646
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
4747
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
4848
</actionGroup>
49-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
49+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
5050
<argument name="enabled" value="1"/>
5151
</actionGroup>
5252
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</annotations>
2424
<before>
2525
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
26-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2727
<argument name="enabled" value="0"/>
2828
</actionGroup>
2929
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
@@ -42,7 +42,7 @@
4242
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
4343
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
4444
</actionGroup>
45-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
45+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
4646
<argument name="enabled" value="1"/>
4747
</actionGroup>
4848
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</annotations>
2424
<before>
2525
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
26-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2727
<argument name="enabled" value="0"/>
2828
</actionGroup>
2929
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
@@ -41,7 +41,7 @@
4141
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
4242
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
4343
</actionGroup>
44-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
44+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
4545
<argument name="enabled" value="1"/>
4646
</actionGroup>
4747
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</annotations>
2424
<before>
2525
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
26-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2727
<argument name="enabled" value="0"/>
2828
</actionGroup>
2929
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
@@ -41,7 +41,7 @@
4141
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
4242
<argument name="Image" value="PageBuilderBackgroundImage_GIF"/>
4343
</actionGroup>
44-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
44+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
4545
<argument name="enabled" value="1"/>
4646
</actionGroup>
4747
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</annotations>
2323
<before>
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
25+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2626
<argument name="enabled" value="0"/>
2727
</actionGroup>
2828
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
@@ -41,7 +41,7 @@
4141
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
4242
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
4343
</actionGroup>
44-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
44+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
4545
<argument name="enabled" value="1"/>
4646
</actionGroup>
4747
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</annotations>
2424
<before>
2525
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
26-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2727
<argument name="enabled" value="0"/>
2828
</actionGroup>
2929
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
@@ -41,7 +41,7 @@
4141
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
4242
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
4343
</actionGroup>
44-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
44+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
4545
<argument name="enabled" value="1"/>
4646
</actionGroup>
4747
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@
2222
<group value="cloud"/>
2323
</annotations>
2424
<before>
25-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
26-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
25+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2726
<argument name="enabled" value="0"/>
2827
</actionGroup>
28+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
29+
<argument name="tags" value="config"/>
30+
</actionGroup>
31+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2932
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
3033
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
3134
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -41,7 +44,7 @@
4144
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
4245
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
4346
</actionGroup>
44-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
47+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
4548
<argument name="enabled" value="1"/>
4649
</actionGroup>
4750
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</annotations>
2424
<before>
2525
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
26-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2727
<argument name="enabled" value="0"/>
2828
</actionGroup>
2929
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
@@ -41,7 +41,7 @@
4141
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
4242
<argument name="Image" value="PageBuilderBackgroundImage_PNG"/>
4343
</actionGroup>
44-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
44+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
4545
<argument name="enabled" value="1"/>
4646
</actionGroup>
4747
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</annotations>
2424
<before>
2525
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
26-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
26+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2727
<argument name="enabled" value="0"/>
2828
</actionGroup>
2929
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
@@ -46,7 +46,7 @@
4646
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
4747
<argument name="Image" value="{{ImageFolder.name}}"/>
4848
</actionGroup>
49-
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
49+
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
5050
<argument name="enabled" value="1"/>
5151
</actionGroup>
5252
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

0 commit comments

Comments
 (0)