Skip to content

Commit ac1227d

Browse files
dhaeckerdhaecker
authored
Merge pull request #98 from magento-arcticfoxes/B2B-1885
[MFTF] Update AdminScheduleImportSimpleProductsWithImagesTest to include before step to disable remote storage
2 parents 63d41a9 + b2619b4 commit ac1227d

10 files changed

+62
-16
lines changed

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
9+
<suite name="RemoteStorageAwsS3EnabledPageBuilderSuite">
10+
<before>
11+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage"/>
12+
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
13+
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
14+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
15+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
16+
</actionGroup>
17+
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
18+
<magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
19+
<magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
20+
<magentoCLI command="config:set web/default_layouts/default_product_layout product-full-width" stepKey="setPageBuilderDefaultProductLayout"/>
21+
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
22+
</before>
23+
<after>
24+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
25+
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
26+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
27+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
28+
</actionGroup>
29+
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
30+
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
31+
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
32+
</after>
33+
<include>
34+
<group name="remote_storage_aws_s3_pagebuilder"/>
35+
</include>
36+
</suite>
37+
</suites>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="remote_storage_aws_s3_pagebuilder"/>
2223
</annotations>
2324
<before>
24-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
25+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
2526
</before>
2627
<after>
27-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
28+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
2829
</after>
2930
</test>
3031
</tests>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="remote_storage_aws_s3_pagebuilder"/>
2223
</annotations>
2324
<before>
24-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
25+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
2526
</before>
2627
<after>
27-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
28+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
2829
</after>
2930
</test>
3031
</tests>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717
<group value="pagebuilder"/>
1818
<group value="pagebuilder-image"/>
1919
<group value="remote_storage_aws_s3"/>
20+
<group value="remote_storage_aws_s3_pagebuilder"/>
2021
</annotations>
2122
<before>
22-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
23+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
2324
</before>
2425
<after>
25-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
26+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
2627
</after>
2728
</test>
2829
</tests>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="remote_storage_aws_s3_pagebuilder"/>
2223
</annotations>
2324
<before>
24-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
25+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
2526
</before>
2627
<after>
27-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
28+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
2829
</after>
2930
</test>
3031
</tests>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121
<group value="pagebuilder-cms-block"/>
2222
<group value="pagebuilder-cms-category"/>
2323
<group value="remote_storage_aws_s3"/>
24+
<group value="remote_storage_aws_s3_pagebuilder"/>
2425
</annotations>
2526
<before>
26-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
27+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
2728
</before>
2829
<after>
29-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
30+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
3031
</after>
3132
</test>
3233
</tests>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-templates"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="remote_storage_aws_s3_pagebuilder"/>
2223
</annotations>
2324
<before>
24-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
25+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
2526
</before>
2627
<after>
27-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
28+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
2829
</after>
2930
</test>
3031
</tests>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-templates"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="remote_storage_aws_s3_pagebuilder"/>
2223
</annotations>
2324
<before>
24-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
25+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
2526
</before>
2627
<after>
27-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
28+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
2829
</after>
2930
</test>
3031
</tests>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/AwsS3CanAddVideoToColumnTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020
<group value="pagebuilder-column"/>
2121
<group value="pagebuilder-video"/>
2222
<group value="remote_storage_aws_s3"/>
23+
<group value="remote_storage_aws_s3_pagebuilder"/>
2324
</annotations>
2425
<before>
25-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
26+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
2627
</before>
2728
<after>
28-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
29+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
2930
</after>
3031
</test>
3132
</tests>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
</include>
3030
<exclude>
3131
<group name="pagebuilder-requiresValidMapAPIKey"/>
32+
<group name="remote_storage_aws_s3_pagebuilder"/>
3233
</exclude>
3334
</suite>
3435
</suites>

0 commit comments

Comments
 (0)