Skip to content

Commit f4cca6f

Browse files
petrovsapetrovsa
committed
Merge branch 'develop' into 696_dynamic_block_for_each_segment_type
2 parents 5639d72 + 404f98b commit f4cca6f

File tree

1,119 files changed

+10478
-1467
lines changed

Some content is hidden

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

1,119 files changed

+10478
-1467
lines changed

‎app/code/Magento/AwsS3PageBuilder/LICENSE_EE.txt

Lines changed: 437 additions & 0 deletions
Large diffs are not rendered by default.

‎app/code/Magento/AwsS3PageBuilder/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Magento_AwsS3PageBuilder module
2+
3+
The Magento_AwsS3PageBuilder module created for maintaining Page Builder tests related to Aws S3 remote storage functionality

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="ImageAddImageContentTypeToCMSPageAwsS3Test" extends="ImageAddImageContentTypeToCMSPageTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Image"/>
14+
<title value="Add Image in PageBuilder for new CMS page with Aws S3 enabled and view on Storefront"/>
15+
<description value="A user should be able to add an image into a row."/>
16+
<severity value="BLOCKER"/>
17+
<useCaseId value="MAGETWO-83926"/>
18+
<testCaseId value="MC-2694"/>
19+
<group value="pagebuilder"/>
20+
<group value="pagebuilder-image"/>
21+
<group value="remote_storage_aws_s3"/>
22+
</annotations>
23+
<before>
24+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
25+
</before>
26+
<after>
27+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
28+
</after>
29+
</test>
30+
</tests>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AwsS3ImageAddImageIntoPageBuilderStageTest" extends="ImageAddImageIntoPageBuilderStageTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Image"/>
14+
<title value="Add Image via Page Builder with Aws S3 Filestorage enabled"/>
15+
<description value="Upload and select images to/from Magento Media Gallery from the Image content type in the Page Builder Stage."/>
16+
<severity value="BLOCKER"/>
17+
<useCaseId value="MAGETWO-71618"/>
18+
<testCaseId value="MC-1334"/>
19+
<group value="pagebuilder"/>
20+
<group value="pagebuilder-image"/>
21+
<group value="remote_storage_aws_s3"/>
22+
</annotations>
23+
<before>
24+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
25+
</before>
26+
<after>
27+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
28+
</after>
29+
</test>
30+
</tests>

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AwsS3ImageInvalidFileTypeValidationTest" extends="ImageInvalidFileTypeValidationTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Image"/>
14+
<title value="Image Invalid File Type Upload validation with Aws S3 Filestorage enabled"/>
15+
<description value="Tests that the Image Validation functions as expected for invalid file type"/>
16+
<severity value="MAJOR"/>
17+
<group value="pagebuilder"/>
18+
<group value="pagebuilder-image"/>
19+
<group value="remote_storage_aws_s3"/>
20+
</annotations>
21+
<before>
22+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
23+
</before>
24+
<after>
25+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
26+
</after>
27+
</test>
28+
</tests>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AwsS3ImageRemoveImageFromStageTest" extends="ImageRemoveImageFromStageTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Image"/>
14+
<title value="Delete Image via Page Builder with Aws S3 Filestorage enabled"/>
15+
<description value="A user should be able to remove image type from a row."/>
16+
<severity value="CRITICAL"/>
17+
<useCaseId value="MAGETWO-83926"/>
18+
<testCaseId value="MC-4022"/>
19+
<group value="pagebuilder"/>
20+
<group value="pagebuilder-image"/>
21+
<group value="remote_storage_aws_s3"/>
22+
</annotations>
23+
<before>
24+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
25+
</before>
26+
<after>
27+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
28+
</after>
29+
</test>
30+
</tests>

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory" extends="PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Templates"/>
14+
<title value="Create Template on CMS Block for a page and Apply Template to Catalog Category with Aws S3 filestorage enabled"/>
15+
<description value="Verify that a user can create a Page Builder template on the CMS Block stage for a page and apply this template to a Catalog Category."/>
16+
<severity value="CRITICAL"/>
17+
<useCaseId value="PB-341"/>
18+
<testCaseId value="MC-30724"/>
19+
<group value="pagebuilder"/>
20+
<group value="pagebuilder-templates"/>
21+
<group value="pagebuilder-cms-block"/>
22+
<group value="pagebuilder-cms-category"/>
23+
<group value="remote_storage_aws_s3"/>
24+
</annotations>
25+
<before>
26+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
27+
</before>
28+
<after>
29+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
30+
</after>
31+
</test>
32+
</tests>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AwsS3PageBuilderDeleteTemplate" extends="PageBuilderDeleteTemplate">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Templates"/>
14+
<title value="Delete Page Builder Template and Validate Grid Data with Aws S3 Fielstorage enabled"/>
15+
<description value="Verify that when a user deletes a template, the template is removed from the template grids."/>
16+
<severity value="CRITICAL"/>
17+
<useCaseId value="PB-341"/>
18+
<testCaseId value="MC-30593"/>
19+
<group value="pagebuilder"/>
20+
<group value="pagebuilder-templates"/>
21+
<group value="remote_storage_aws_s3"/>
22+
</annotations>
23+
<before>
24+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
25+
</before>
26+
<after>
27+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
28+
</after>
29+
</test>
30+
</tests>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut" extends="PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Templates"/>
14+
<title value="Verify Save Content as Template Modal and Apply Template Slide Out With Aws S3 Filestorage enabled"/>
15+
<description value="Verify the functionality and content of the Save Content as Template modal and the Apply Template slide out."/>
16+
<severity value="AVERAGE"/>
17+
<useCaseId value="PB-341"/>
18+
<testCaseId value="MC-30619"/>
19+
<group value="pagebuilder"/>
20+
<group value="pagebuilder-templates"/>
21+
<group value="remote_storage_aws_s3"/>
22+
</annotations>
23+
<before>
24+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
25+
</before>
26+
<after>
27+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
28+
</after>
29+
</test>
30+
</tests>

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AwsS3CanAddVideoToColumnTest" extends="CanAddVideoToColumnTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Video"/>
14+
<title value="Add Video to Column container and view on Admin and Storefront with Aws S3 Filestorage enabled"/>
15+
<description value="As a Content Manager I want column to be a container so that I can add video inside the column"/>
16+
<severity value="BLOCKER"/>
17+
<useCaseId value="MAGETWO-87081"/>
18+
<testCaseId value="MC-2494"/>
19+
<group value="pagebuilder"/>
20+
<group value="pagebuilder-column"/>
21+
<group value="pagebuilder-video"/>
22+
<group value="remote_storage_aws_s3"/>
23+
</annotations>
24+
<before>
25+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
26+
</before>
27+
<after>
28+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
29+
</after>
30+
</test>
31+
</tests>

0 commit comments

Comments
 (0)