Skip to content

Commit dce14bd

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

5 files changed

+15
-10
lines changed

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

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

49-
<comment userInput="BIC workaround" stepKey="copyProduct1BaseImageInS3" after="syncRemoteStorage"/>
49+
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFilesInS3" after="syncRemoteStorage"/>
50+
<comment userInput="BIC workaround" stepKey="copyProduct1BaseImageInS3" after="createDirectoryForImportFilesInS3"/>
5051
<comment userInput="BIC workaround" stepKey="copyProduct2BaseImageInS3" after="copyProduct1BaseImageInS3"/>
5152
<comment userInput="BIC workaround" stepKey="copyProduct3BaseImageInS3" after="copyProduct2BaseImageInS3"/>
5253
</before>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFiles" after="createCustomer"/>
2828
<comment userInput="BIC workaround" stepKey="copyImportFile" after="createDirectoryForImportFiles"/>
2929
<remove keyForRemoval="createDirectoryForImportImages"/>
30-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportFilesInS3">
30+
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportImagesInS3">
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,7 +46,8 @@
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="copyBaseImageInS3" after="syncRemoteStorage"/>
49+
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFilesInS3" after="syncRemoteStorage"/>
50+
<comment userInput="BIC workaround" stepKey="copyBaseImageInS3" after="createDirectoryForImportFilesInS3"/>
5051
<comment userInput="BIC workaround" stepKey="copySmallImageInS3" after="copyBaseImageInS3"/>
5152
<comment userInput="BIC workaround" stepKey="copyThumbnailImageInS3" after="copySmallImageInS3"/>
5253

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFiles" after="createCustomer"/>
2828
<comment userInput="BIC workaround" stepKey="copyImportFile" after="createDirectoryForImportFiles"/>
2929
<remove keyForRemoval="createDirectoryForImportImages"/>
30-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportFilesInS3">
30+
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportImagesInS3">
3131
<argument name="path">var/import/images/{{ImportProduct_Downloadable_UrlLinks.name}}</argument>
3232
</helper>
3333
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copyFromLocal" stepKey="copyBaseImage">
@@ -46,7 +46,8 @@
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="copyBaseImageInS3" after="syncRemoteStorage"/>
49+
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFilesInS3" after="syncRemoteStorage"/>
50+
<comment userInput="BIC workaround" stepKey="copyBaseImageInS3" after="createDirectoryForImportFilesInS3"/>
5051
<comment userInput="BIC workaround" stepKey="copySmallImageInS3" after="copyBaseImageInS3"/>
5152
<comment userInput="BIC workaround" stepKey="copyThumbnailImageInS3" after="copySmallImageInS3"/>
5253
</before>

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

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

49-
<comment userInput="BIC workaround" stepKey="copyProduct1BaseImageInS3" after="syncRemoteStorage"/>
49+
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFilesInS3" after="syncRemoteStorage"/>
50+
<comment userInput="BIC workaround" stepKey="copyProduct1BaseImageInS3" after="createDirectoryForImportFilesInS3"/>
5051
<comment userInput="BIC workaround" stepKey="copyProduct2BaseImageInS3" after="copyProduct1BaseImageInS3"/>
5152
<comment userInput="BIC workaround" stepKey="copyProduct3BaseImageInS3" after="copyProduct2BaseImageInS3"/>
5253
</before>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFiles" after="createCustomer"/>
2929
<comment userInput="BIC workaround" stepKey="copyImportFile" after="createDirectoryForImportFiles"/>
3030
<remove keyForRemoval="createDirectoryForImportImages"/>
31-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportFilesInS3">
31+
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportImagesInS3">
3232
<argument name="path">var/import/images/{{ImportProduct_Configurable.name}}</argument>
3333
</helper>
3434
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copyFromLocal" stepKey="copyProduct1BaseImage">
@@ -47,7 +47,8 @@
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-
<comment userInput="BIC workaround" stepKey="copyProduct1BaseImageInS3" after="syncRemoteStorage"/>
50+
<comment userInput="BIC workaround" stepKey="createDirectoryForImportFilesInS3" after="syncRemoteStorage"/>
51+
<comment userInput="BIC workaround" stepKey="copyProduct1BaseImageInS3" after="createDirectoryForImportFilesInS3"/>
5152
<comment userInput="BIC workaround" stepKey="copyProduct2BaseImageInS3" after="copyProduct1BaseImageInS3"/>
5253
<comment userInput="BIC workaround" stepKey="copyProduct3BaseImageInS3" after="copyProduct2BaseImageInS3"/>
5354
</before>

0 commit comments

Comments
 (0)