Skip to content

Commit d2ec1de

Browse files
okolesnykokolesnyk
committed
Merge branch 'stability_control' of github.com:magento-commerce/magento2-page-builder into stability_control
2 parents f2a87c7 + 8105bd8 commit d2ec1de

File tree

29 files changed

+153
-51
lines changed

29 files changed

+153
-51
lines changed

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Suite/RemoteStorageAwsS3EnabledPageBuilderSuite.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
<magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
1919
<magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
2020
<magentoCLI command="config:set web/default_layouts/default_product_layout product-full-width" stepKey="setPageBuilderDefaultProductLayout"/>
21-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
21+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
22+
<argument name="tags" value="config"/>
23+
</actionGroup>
2224
</before>
2325
<after>
2426
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
@@ -28,7 +30,9 @@
2830
</actionGroup>
2931
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
3032
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
31-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
33+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
34+
<argument name="tags" value="config"/>
35+
</actionGroup>
3236
</after>
3337
<include>
3438
<group name="remote_storage_aws_s3_pagebuilder"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderDisabledSuite.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@
1111
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disblePageBuilder"/>
1212
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
1313
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
14-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
14+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
15+
<argument name="tags" value="config"/>
16+
</actionGroup>
1517
</before>
1618
<after>
1719
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
1820
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
1921
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
20-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
22+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
23+
<argument name="tags" value="config"/>
24+
</actionGroup>
2125
</after>
2226
<include>
2327
<group name="pagebuilder_disabled"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderRequiresValidGoogleMapsAPIKeySuite.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@
1515
<magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
1616
<magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
1717
<magentoCLI command="config:set web/default_layouts/default_product_layout product-full-width" stepKey="setPageBuilderDefaultProductLayout"/>
18-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
18+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
19+
<argument name="tags" value="config"/>
20+
</actionGroup>
1921
</before>
2022
<after>
2123
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
2224
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2325
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
2426
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
25-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
27+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
28+
<argument name="tags" value="config"/>
29+
</actionGroup>
2630
</after>
2731
<include>
2832
<group name="pagebuilder-requiresValidMapAPIKey"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderSuite.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@
1515
<magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
1616
<magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
1717
<magentoCLI command="config:set web/default_layouts/default_product_layout product-full-width" stepKey="setPageBuilderDefaultProductLayout"/>
18-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
18+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
19+
<argument name="tags" value="config"/>
20+
</actionGroup>
1921
</before>
2022
<after>
2123
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
2224
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2325
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
2426
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
25-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
27+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
28+
<argument name="tags" value="config"/>
29+
</actionGroup>
2630
</after>
2731
<include>
2832
<group name="pagebuilder"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddImageToWYSIWYGBlockTest.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@
1010
<test name="AdminAddImageToWYSIWYGBlockTest">
1111
<before>
1212
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="enableTinyMCE"/>
13-
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
13+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
14+
<argument name="tags" value="config"/>
15+
</actionGroup>
1416
</before>
1517
<after>
1618
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
17-
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
19+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
20+
<argument name="tags" value="config"/>
21+
</actionGroup>
1822
</after>
1923
</test>
2024
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddVariableToWYSIWYGBlockTest.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@
1010
<test name="AdminAddVariableToWYSIWYGBlockTest">
1111
<before>
1212
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="enableTinyMCE"/>
13-
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
13+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
14+
<argument name="tags" value="config"/>
15+
</actionGroup>
1416
</before>
1517
<after>
1618
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
17-
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
19+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
20+
<argument name="tags" value="config"/>
21+
</actionGroup>
1822
</after>
1923
</test>
2024
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddWidgetToWYSIWYGBlockTest.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@
1010
<test name="AdminAddWidgetToWYSIWYGBlockTest">
1111
<before>
1212
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="enableTinyMCE"/>
13-
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
13+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
14+
<argument name="tags" value="config"/>
15+
</actionGroup>
1416
</before>
1517
<after>
1618
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
17-
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
19+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
20+
<argument name="tags" value="config"/>
21+
</actionGroup>
1822
</after>
1923
</test>
2024
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@
1010
<test name="AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest">
1111
<before>
1212
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="enableTinyMCE"/>
13-
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
13+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
14+
<argument name="tags" value="config"/>
15+
</actionGroup>
1416
</before>
1517
<after>
1618
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
17-
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
19+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
20+
<argument name="tags" value="config"/>
21+
</actionGroup>
1822
</after>
1923
</test>
2024
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminCreateCmsBlockWithMarginalSpaceTest.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,15 @@
1111
<test name="AdminCreateCmsBlockWithMarginalSpaceTest">
1212
<before>
1313
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="loginGetFromGeneralFile"/>
14-
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
14+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
15+
<argument name="tags" value="config"/>
16+
</actionGroup>
1517
</before>
1618
<after>
1719
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="adminLogout"/>
18-
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
20+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
21+
<argument name="tags" value="config"/>
22+
</actionGroup>
1923
</after>
2024
</test>
2125
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminCreateDuplicatedCmsBlockTest.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@
1010
<test name="AdminCreateDuplicatedCmsBlockTest">
1111
<before>
1212
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="loginGetFromGeneralFile"/>
13-
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
13+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
14+
<argument name="tags" value="config"/>
15+
</actionGroup>
1416
</before>
1517
<after>
1618
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="logout"/>
17-
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
19+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
20+
<argument name="tags" value="config"/>
21+
</actionGroup>
1822
</after>
1923
</test>
2024
</tests>

0 commit comments

Comments
 (0)