|
24 | 24 | </annotations>
|
25 | 25 |
|
26 | 26 | <before>
|
27 |
| - <!-- Locally Copy Import Files to Unique Media Import Directory --> |
28 |
| - <helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="createDirectory" stepKey="createDirectoryForImportFiles" after="createCustomer"> |
29 |
| - <argument name="path">pub/media/import/{{ImportProduct_Downloadable_FileLinks.name}}</argument> |
30 |
| - </helper> |
31 |
| - <helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="copy" stepKey="copyImportFile" after="createDirectoryForImportFiles"> |
32 |
| - <argument name="source">dev/tests/acceptance/tests/_data/{{ImportProduct_Downloadable_FileLinks.fileName}}</argument> |
33 |
| - <argument name="destination">pub/media/import/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.fileName}}</argument> |
34 |
| - </helper> |
| 27 | + <comment userInput="BIC workaround" stepKey="createDirectoryForImportFiles" after="createCustomer"/> |
| 28 | + <comment userInput="BIC workaround" stepKey="copyImportFile" after="createDirectoryForImportFiles"/> |
35 | 29 | <remove keyForRemoval="createDirectoryForImportImages"/>
|
36 |
| - <helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="copy" stepKey="copyBaseImage"> |
| 30 | + <helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportImagesInS3"> |
| 31 | + <argument name="path">var/import/images/{{ImportProduct_Downloadable_FileLinks.name}}</argument> |
| 32 | + </helper> |
| 33 | + <helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copyFromLocal" stepKey="copyBaseImage"> |
37 | 34 | <argument name="source">dev/tests/acceptance/tests/_data/{{ImportProduct_Downloadable_FileLinks.baseImage}}</argument>
|
38 |
| - <argument name="destination">pub/media/import/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.baseImage}}</argument> |
| 35 | + <argument name="destination">var/import/images/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.baseImage}}</argument> |
39 | 36 | </helper>
|
40 |
| - <helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="copy" stepKey="copySmallImage"> |
| 37 | + <helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copyFromLocal" stepKey="copySmallImage"> |
41 | 38 | <argument name="source">dev/tests/acceptance/tests/_data/{{ImportProduct_Downloadable_FileLinks.smallImage}}</argument>
|
42 |
| - <argument name="destination">pub/media/import/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.smallImage}}</argument> |
| 39 | + <argument name="destination">var/import/images/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.smallImage}}</argument> |
43 | 40 | </helper>
|
44 |
| - <helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="copy" stepKey="copyThumbnailImage"> |
| 41 | + <helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copyFromLocal" stepKey="copyThumbnailImage"> |
45 | 42 | <argument name="source">dev/tests/acceptance/tests/_data/{{ImportProduct_Downloadable_FileLinks.thumbnailImage}}</argument>
|
46 |
| - <argument name="destination">pub/media/import/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.thumbnailImage}}</argument> |
| 43 | + <argument name="destination">var/import/images/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.thumbnailImage}}</argument> |
47 | 44 | </helper>
|
48 | 45 |
|
49 |
| - <!-- Enable AWS S3 Remote Storage & Sync --> |
50 | 46 | <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="copyThumbnailImage"/>
|
51 | 47 | <magentoCLI command="remote-storage:sync" timeout="120" stepKey="syncRemoteStorage" after="enableRemoteStorage"/>
|
52 | 48 |
|
53 |
| - <!-- Copy to Import Directory in AWS S3 --> |
54 |
| - <helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportFilesInS3" after="syncRemoteStorage"> |
55 |
| - <argument name="path">var/import/images/{{ImportProduct_Downloadable_FileLinks.name}}</argument> |
| 49 | + <comment userInput="BIC workaround" stepKey="createDirectoryForImportFilesInS3" after="syncRemoteStorage"/> |
| 50 | + <comment userInput="BIC workaround" stepKey="copyBaseImageInS3" after="createDirectoryForImportFilesInS3"/> |
| 51 | + <comment userInput="BIC workaround" stepKey="copySmallImageInS3" after="copyBaseImageInS3"/> |
| 52 | + <comment userInput="BIC workaround" stepKey="copyThumbnailImageInS3" after="copySmallImageInS3"/> |
| 53 | + |
| 54 | + <helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="createDirectory" stepKey="createDirectoryForImportDownloadableLinkFiles"> |
| 55 | + <argument name="path">media/import/{{ImportProduct_Downloadable_FileLinks.name}}</argument> |
56 | 56 | </helper>
|
57 |
| - <helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copy" stepKey="copyBaseImageInS3" after="createDirectoryForImportFilesInS3"> |
58 |
| - <argument name="source">media/import/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.baseImage}}</argument> |
59 |
| - <argument name="destination">var/import/images/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.baseImage}}</argument> |
| 57 | + <helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copyFromLocal" stepKey="copyBaseImage2"> |
| 58 | + <argument name="source">dev/tests/acceptance/tests/_data/{{ImportProduct_Downloadable_FileLinks.baseImage}}</argument> |
| 59 | + <argument name="destination">media/import/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.baseImage}}</argument> |
60 | 60 | </helper>
|
61 |
| - <helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copy" stepKey="copySmallImageInS3" after="copyBaseImageInS3"> |
62 |
| - <argument name="source">media/import/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.smallImage}}</argument> |
63 |
| - <argument name="destination">var/import/images/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.smallImage}}</argument> |
| 61 | + <helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copyFromLocal" stepKey="copySmallImage2"> |
| 62 | + <argument name="source">dev/tests/acceptance/tests/_data/{{ImportProduct_Downloadable_FileLinks.smallImage}}</argument> |
| 63 | + <argument name="destination">media/import/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.smallImage}}</argument> |
64 | 64 | </helper>
|
65 |
| - <helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copy" stepKey="copyThumbnailImageInS3" after="copySmallImageInS3"> |
66 |
| - <argument name="source">media/import/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.thumbnailImage}}</argument> |
67 |
| - <argument name="destination">var/import/images/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.thumbnailImage}}</argument> |
| 65 | + <helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="copyFromLocal" stepKey="copyThumbnailImage3"> |
| 66 | + <argument name="source">dev/tests/acceptance/tests/_data/{{ImportProduct_Downloadable_FileLinks.thumbnailImage}}</argument> |
| 67 | + <argument name="destination">media/import/{{ImportProduct_Downloadable_FileLinks.name}}/{{ImportProduct_Downloadable_FileLinks.thumbnailImage}}</argument> |
68 | 68 | </helper>
|
69 | 69 | </before>
|
70 | 70 |
|
71 | 71 | <after>
|
72 | 72 | <!-- Delete S3 Data -->
|
73 | 73 | <remove keyForRemoval="deleteProductImageDirectory"/>
|
74 |
| - <helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteImportFilesDirectoryS3" after="deleteCustomer"> |
75 |
| - <argument name="path">media/import/{{ImportProduct_Downloadable_FileLinks.name}}</argument> |
76 |
| - </helper> |
| 74 | + <comment userInput="BIC workaround" stepKey="deleteImportFilesDirectoryS3" after="deleteCustomer"/> |
77 | 75 | <helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteImportImagesFilesDirectoryS3" after="deleteImportFilesDirectoryS3">
|
78 | 76 | <argument name="path">var/import/images/{{ImportProduct_Downloadable_FileLinks.name}}</argument>
|
79 | 77 | </helper>
|
80 | 78 |
|
81 | 79 | <!-- Disable AWS S3 Remote Storage & Delete Local Data -->
|
82 | 80 | <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logoutFromAdmin"/>
|
83 |
| - <helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="deleteDirectory" stepKey="deleteImportFilesDirectoryLocal" after="disableRemoteStorage"> |
84 |
| - <argument name="path">pub/media/import/{{ImportProduct_Downloadable_FileLinks.name}}</argument> |
85 |
| - </helper> |
| 81 | + <comment userInput="BIC workaround" stepKey="deleteImportFilesDirectoryLocal" after="disableRemoteStorage"/> |
86 | 82 | </after>
|
87 | 83 |
|
88 | 84 | <!-- Import Downloadable Product -->
|
|
0 commit comments