Skip to content

Commit 9850c4a

Browse files
danmooney2danmooney2
committed
Merge remote-tracking branch 'af/2.4-develop' into B2B-1785
2 parents 01dacc4 + 77bfde9 commit 9850c4a

File tree

146 files changed

+4166
-6160
lines changed

Some content is hidden

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

146 files changed

+4166
-6160
lines changed

‎app/code/Magento/AwsS3/Test/Mftf/Suite/RemoteStorageAwsS3EnabledSuite.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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="RemoteStorageAwsS3EnabledSuite">
10+
<before>
11+
<!-- Enable AWS S3 Remote Storage -->
12+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage"/>
13+
</before>
14+
<after>
15+
<!-- Disable Remote Storage -->
16+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
17+
</after>
18+
<include>
19+
<group name="remote_storage_aws_s3"/>
20+
</include>
21+
<exclude>
22+
<group name="remote_storage_disabled"/>
23+
<group name="remote_storage_aws_s3_pagebuilder"/>
24+
</exclude>
25+
</suite>
26+
</suites>

‎app/code/Magento/AwsS3/Test/Mftf/Suite/RemoteStorageDisabledSuite.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="RemoteStorageDisabledSuite">
10+
<before>
11+
<!-- Disable Remote Storage -->
12+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
13+
</before>
14+
<after>
15+
<!-- Disable Remote Storage -->
16+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
17+
</after>
18+
<include>
19+
<group name="remote_storage_disabled"/>
20+
</include>
21+
</suite>
22+
</suites>

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportBundleProductTest.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,14 @@
2727
</annotations>
2828

2929
<before>
30-
<!-- Enable AWS S3 Remote Storage -->
31-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" before="firstSimpleProductForDynamic"/>
30+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
3231
</before>
3332

3433
<after>
3534
<helper class="\Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteExportFileDirectory">
3635
<argument name="path">import_export/export</argument>
3736
</helper>
38-
39-
<!-- Disable AWS S3 Remote Storage -->
40-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
37+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
4138
</after>
4239

4340
<!-- Validate Export File on File System: Dynamic Bundle Product -->

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportDownloadableProductWithFileLinksTest.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,14 @@
2828
</annotations>
2929

3030
<before>
31-
<!-- Enable AWS S3 Remote Storage -->
32-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" before="createCategory"/>
31+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
3332
</before>
3433

3534
<after>
3635
<helper class="\Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteExportFileDirectory">
3736
<argument name="path">import_export/export</argument>
3837
</helper>
39-
40-
<!-- Disable AWS S3 Remote Storage -->
41-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
38+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
4239
</after>
4340

4441
<!-- Validate Export File on S3 -->

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportDownloadableProductWithURLLinksTest.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,14 @@
2828
</annotations>
2929

3030
<before>
31-
<!-- Enable AWS S3 Remote Storage -->
32-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" before="addDownloadableDomain"/>
31+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
3332
</before>
3433

3534
<after>
3635
<helper class="\Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteExportFileDirectory">
3736
<argument name="path">import_export/export</argument>
3837
</helper>
39-
40-
<!-- Disable AWS S3 Remote Storage -->
41-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
38+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
4239
</after>
4340

4441
<!-- Validate Export File on S3 -->

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportGroupedProductWithSpecialPriceTest.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,14 @@
2727
</annotations>
2828

2929
<before>
30-
<!-- Enable AWS S3 Remote Storage -->
31-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" before="createFirstSimpleProduct"/>
30+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
3231
</before>
3332

3433
<after>
3534
<helper class="\Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteExportFileDirectory">
3635
<argument name="path">import_export/export</argument>
3736
</helper>
38-
39-
<!-- Disable AWS S3 Remote Storage -->
40-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
37+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
4138
</after>
4239

4340
<!-- Validate Export File on S3: Grouped Product with Special Price -->

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,14 @@
2828
</annotations>
2929

3030
<before>
31-
<!-- Enable AWS S3 Remote Storage -->
32-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" before="createCategory"/>
31+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
3332
</before>
3433

3534
<after>
3635
<helper class="\Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteExportFileDirectory">
3736
<argument name="path">import_export/export</argument>
3837
</helper>
39-
40-
<!-- Disable AWS S3 Remote Storage -->
41-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
38+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
4239
</after>
4340

4441
<!-- Validate Export File on S3: Product with Custom Options -->

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,14 @@
2828
</annotations>
2929

3030
<before>
31-
<!-- Enable AWS S3 Remote Storage -->
32-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" before="createCategory"/>
31+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
3332
</before>
3433

3534
<after>
3635
<helper class="\Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteExportFileDirectory">
3736
<argument name="path">import_export/export</argument>
3837
</helper>
39-
40-
<!-- Disable AWS S3 Remote Storage -->
41-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
38+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
4239
</after>
4340

4441
<!-- Validate Export File on S3: Configurable Product -->

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportTaxRatesTest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@
2828
</annotations>
2929

3030
<before>
31-
<!-- Enable AWS S3 Remote Storage -->
32-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" before="revertInitialTaxRateCA"/>
31+
<comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
3332
</before>
3433

3534
<after>
36-
<!-- Disable AWS S3 Remote Storage -->
37-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logoutFromAdmin"/>
35+
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
3836
</after>
3937
</test>
4038
</tests>

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ImportBundleProductTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<group value="importExport"/>
2020
<group value="Bundle"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="remote_storage_disabled"/>
2223
</annotations>
2324

2425
<before>

0 commit comments

Comments
 (0)