Skip to content

Commit 2a5a003

Browse files
joanhejoanhe
committed
B2B-2135: [AWS S3] Remove redundant steps from AwsS3* tests
1 parent 0cd5bbe commit 2a5a003

6 files changed

+19
-26
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,10 @@
2424
</annotations>
2525

2626
<before>
27-
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="createCustomer"/>
28-
<magentoCLI command="remote-storage:sync" timeout="120" stepKey="syncRemoteStorage" after="enableRemoteStorage"/>
29-
30-
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFiles" after="syncRemoteStorage"/>
27+
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFiles" after="createCustomer"/>
3128
<comment userInput="BIC workaround" stepKey="copyImportFile" after="createDirectoryForImportFiles"/>
32-
33-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportImages">
29+
<remove keyForRemoval="createDirectoryForImportImages"/>
30+
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportFilesInS3">
3431
<argument name="path">var/import/images/{{ImportProduct_Bundle.name}}</argument>
3532
</helper>
3633
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copyFromLocal" stepKey="copyProduct1BaseImage">
@@ -46,8 +43,10 @@
4643
<argument name="destination">var/import/images/{{ImportProduct_Bundle.name}}/{{ImportProductSimple3_Bundle.thumbnailImage}}</argument>
4744
</helper>
4845

49-
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFilesInS3" after="copyProduct3BaseImage"/>
50-
<comment userInput="BIC workaround" stepKey="copyProduct1BaseImageInS3" after="createDirectoryForImportFilesInS3"/>
46+
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="copyProduct3BaseImage"/>
47+
<magentoCLI command="remote-storage:sync" timeout="120" stepKey="syncRemoteStorage" after="enableRemoteStorage"/>
48+
49+
<comment userInput="BIC workaround" stepKey="copyProduct1BaseImageInS3" after="syncRemoteStorage"/>
5150
<comment userInput="BIC workaround" stepKey="copyProduct2BaseImageInS3" after="copyProduct1BaseImageInS3"/>
5251
<comment userInput="BIC workaround" stepKey="copyProduct3BaseImageInS3" after="copyProduct2BaseImageInS3"/>
5352
</before>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<before>
2727
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFiles" after="createCustomer"/>
2828
<comment userInput="BIC workaround" stepKey="copyImportFile" after="createDirectoryForImportFiles"/>
29-
30-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportImages">
29+
<remove keyForRemoval="createDirectoryForImportImages"/>
30+
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportFilesInS3">
3131
<argument name="path">var/import/images/{{ImportProduct_Downloadable_FileLinks.name}}</argument>
3232
</helper>
3333
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copyFromLocal" stepKey="copyBaseImage">
@@ -46,8 +46,7 @@
4646
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="copyThumbnailImage"/>
4747
<magentoCLI command="remote-storage:sync" timeout="120" stepKey="syncRemoteStorage" after="enableRemoteStorage"/>
4848

49-
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFilesInS3" after="syncRemoteStorage"/>
50-
<comment userInput="BIC workaround" stepKey="copyBaseImageInS3" after="createDirectoryForImportFilesInS3"/>
49+
<comment userInput="BIC workaround" stepKey="copyBaseImageInS3" after="syncRemoteStorage"/>
5150
<comment userInput="BIC workaround" stepKey="copySmallImageInS3" after="copyBaseImageInS3"/>
5251
<comment userInput="BIC workaround" stepKey="copyThumbnailImageInS3" after="copySmallImageInS3"/>
5352

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
<before>
2727
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFiles" after="createCustomer"/>
2828
<comment userInput="BIC workaround" stepKey="copyImportFile" after="createDirectoryForImportFiles"/>
29-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportImages">
29+
<remove keyForRemoval="createDirectoryForImportImages"/>
30+
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportFilesInS3">
3031
<argument name="path">var/import/images/{{ImportProduct_Downloadable_UrlLinks.name}}</argument>
3132
</helper>
3233
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copyFromLocal" stepKey="copyBaseImage">
@@ -45,9 +46,7 @@
4546
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="copyThumbnailImage"/>
4647
<magentoCLI command="remote-storage:sync" timeout="120" stepKey="syncRemoteStorage" after="enableRemoteStorage"/>
4748

48-
<!-- Copy to Import Directory in AWS S3 -->
49-
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFilesInS3" after="syncRemoteStorage"/>
50-
<comment userInput="BIC workaround" stepKey="copyBaseImageInS3" after="createDirectoryForImportFilesInS3"/>
49+
<comment userInput="BIC workaround" stepKey="copyBaseImageInS3" after="syncRemoteStorage"/>
5150
<comment userInput="BIC workaround" stepKey="copySmallImageInS3" after="copyBaseImageInS3"/>
5251
<comment userInput="BIC workaround" stepKey="copyThumbnailImageInS3" after="copySmallImageInS3"/>
5352
</before>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
<before>
2727
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFiles" after="createCustomer"/>
2828
<comment userInput="BIC workaround" stepKey="copyImportFile" after="createDirectoryForImportFiles"/>
29-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportImages">
29+
<remove keyForRemoval="createDirectoryForImportImages"/>
30+
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportFilesInS3">
3031
<argument name="path">var/import/images/{{ImportProduct_Grouped.name}}</argument>
3132
</helper>
3233
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copyFromLocal" stepKey="copyProduct1BaseImage">
@@ -45,8 +46,7 @@
4546
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="copyProduct3BaseImage"/>
4647
<magentoCLI command="remote-storage:sync" timeout="120" stepKey="syncRemoteStorage" after="enableRemoteStorage"/>
4748

48-
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFilesInS3" after="syncRemoteStorage"/>
49-
<comment userInput="BIC workaround" stepKey="copyProduct1BaseImageInS3" after="createDirectoryForImportFilesInS3"/>
49+
<comment userInput="BIC workaround" stepKey="copyProduct1BaseImageInS3" after="syncRemoteStorage"/>
5050
<comment userInput="BIC workaround" stepKey="copyProduct2BaseImageInS3" after="copyProduct1BaseImageInS3"/>
5151
<comment userInput="BIC workaround" stepKey="copyProduct3BaseImageInS3" after="copyProduct2BaseImageInS3"/>
5252
</before>

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
<before>
2828
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFiles" after="createCustomer"/>
2929
<comment userInput="BIC workaround" stepKey="copyImportFile" after="createDirectoryForImportFiles"/>
30-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportImages">
30+
<remove keyForRemoval="createDirectoryForImportImages"/>
31+
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportFilesInS3">
3132
<argument name="path">var/import/images/{{ImportProduct_Configurable.name}}</argument>
3233
</helper>
3334
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copyFromLocal" stepKey="copyProduct1BaseImage">
@@ -43,13 +44,10 @@
4344
<argument name="destination">var/import/images/{{ImportProduct_Configurable.name}}/{{ImportProductSimple3_Configurable.thumbnailImage}}</argument>
4445
</helper>
4546

46-
<!-- Enable AWS S3 Remote Storage & Sync -->
4747
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="copyProduct3BaseImage"/>
4848
<magentoCLI command="remote-storage:sync" timeout="120" stepKey="syncRemoteStorage" after="enableRemoteStorage"/>
4949

50-
<!-- Copy to Import Directory in AWS S3 -->
51-
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFilesInS3" after="syncRemoteStorage"/>
52-
<comment userInput="BIC workaround" stepKey="copyProduct1BaseImageInS3" after="createDirectoryForImportFilesInS3"/>
50+
<comment userInput="BIC workaround" stepKey="copyProduct1BaseImageInS3" after="syncRemoteStorage"/>
5351
<comment userInput="BIC workaround" stepKey="copyProduct2BaseImageInS3" after="copyProduct1BaseImageInS3"/>
5452
<comment userInput="BIC workaround" stepKey="copyProduct3BaseImageInS3" after="copyProduct2BaseImageInS3"/>
5553
</before>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,9 @@
4141
<argument name="destination">var/import/images/test_image_duplication/{{placeholderThumbnailImage.file}}</argument>
4242
</helper>
4343

44-
<!-- Enable AWS S3 Remote Storage & Sync -->
4544
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="copyProductThumbImage"/>
4645
<magentoCLI command="remote-storage:sync" timeout="120" stepKey="syncRemoteStorage" after="enableRemoteStorage"/>
4746

48-
<!-- Copy to Import Directory in AWS S3 -->
4947
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFilesInS3" after="syncRemoteStorage"/>
5048
<comment userInput="BIC workaround" stepKey="copyProductBaseImageS3" after="createDirectoryForImportFilesInS3"/>
5149
<comment userInput="BIC workaround" stepKey="copyProductSmallImageS3" after="copyProductBaseImageS3"/>

0 commit comments

Comments
 (0)