Skip to content

Commit e43ec0e

Browse files
rganinrganin
committed
Revert "B2B-2081: Stabilize general tests along with S3 specific PR validation tests"
This reverts commit b58a91b.
1 parent 6a4afc0 commit e43ec0e

6 files changed

+116
-116
lines changed

‎app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@
101101
<deleteData createDataKey="firstSimpleProductForFixedWithAttribute" stepKey="deleteFirstSimpleProductForFixedWithAttribute"/>
102102
<deleteData createDataKey="secondSimpleProductForFixedWithAttribute" stepKey="deleteSecondSimpleProductForFixedWithAttribute"/>
103103
<deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
104-
<helper class="\Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="deleteDirectory" stepKey="deleteExportFileDirectory">
105-
<argument name="path">{"local":"var/export","s3":"import_export/export"}</argument>
104+
<helper class="\Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="deleteDirectory" stepKey="deleteExportFileDirectory">
105+
<argument name="path">var/export</argument>
106106
</helper>
107107
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
108108
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -126,83 +126,83 @@
126126
</actionGroup>
127127

128128
<!-- Validate Export File on File System: Dynamic Bundle Product -->
129-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileExists" stepKey="assertExportFileExists">
130-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
129+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileExists" stepKey="assertExportFileExists">
130+
<argument name="filePath">var/export/{$grabNameFile}</argument>
131131
</helper>
132-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForDynamicBundledProduct">
133-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
132+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForDynamicBundledProduct">
133+
<argument name="filePath">var/export/{$grabNameFile}</argument>
134134
<argument name="text">$$firstSimpleProductForDynamic.name$$</argument>
135135
</helper>
136-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForDynamicBundledProduct">
137-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
136+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForDynamicBundledProduct">
137+
<argument name="filePath">var/export/{$grabNameFile}</argument>
138138
<argument name="text">$$secondSimpleProductForDynamic.name$$</argument>
139139
</helper>
140-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsDynamicBundleProduct">
141-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
140+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsDynamicBundleProduct">
141+
<argument name="filePath">var/export/{$grabNameFile}</argument>
142142
<argument name="text">$$createDynamicBundleProduct.name$$</argument>
143143
</helper>
144-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsDynamicBundleProductOption1">
145-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
144+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsDynamicBundleProductOption1">
145+
<argument name="filePath">var/export/{$grabNameFile}</argument>
146146
<argument name="text">name=$createFirstBundleOption.option[title]$,type=$createFirstBundleOption.option[type]$,required=$createFirstBundleOption.option[required]$,sku=$$firstSimpleProductForDynamic.sku$$</argument>
147147
</helper>
148-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsDynamicBundleProductOption2">
149-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
148+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsDynamicBundleProductOption2">
149+
<argument name="filePath">var/export/{$grabNameFile}</argument>
150150
<argument name="text">name=$createFirstBundleOption.option[title]$,type=$createFirstBundleOption.option[type]$,required=$createFirstBundleOption.option[required]$,sku=$$secondSimpleProductForDynamic.sku$$</argument>
151151
</helper>
152-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsDynamicPriceBundleProduct">
153-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
152+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsDynamicPriceBundleProduct">
153+
<argument name="filePath">var/export/{$grabNameFile}</argument>
154154
<argument name="text">0.000000,,,,$$createDynamicBundleProduct.sku$$</argument>
155155
</helper>
156156

157157
<!-- Validate Export File on File System: Fixed Bundle Product -->
158-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForFixedBundledProduct">
159-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
158+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForFixedBundledProduct">
159+
<argument name="filePath">var/export/{$grabNameFile}</argument>
160160
<argument name="text">$$firstSimpleProductForFixed.name$$</argument>
161161
</helper>
162-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForFixedBundledProduct">
163-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
162+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForFixedBundledProduct">
163+
<argument name="filePath">var/export/{$grabNameFile}</argument>
164164
<argument name="text">$$secondSimpleProductForFixed.name$$</argument>
165165
</helper>
166-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedBundleProduct">
167-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
166+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedBundleProduct">
167+
<argument name="filePath">var/export/{$grabNameFile}</argument>
168168
<argument name="text">$$createFixedBundleProduct.name$$</argument>
169169
</helper>
170-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedBundleProductOption1">
171-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
170+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedBundleProductOption1">
171+
<argument name="filePath">var/export/{$grabNameFile}</argument>
172172
<argument name="text">name=$createSecondBundleOption.option[title]$,type=$createSecondBundleOption.option[type]$,required=$createSecondBundleOption.option[required]$,sku=$$firstSimpleProductForFixed.sku$$</argument>
173173
</helper>
174-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedBundleProductOption2">
175-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
174+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedBundleProductOption2">
175+
<argument name="filePath">var/export/{$grabNameFile}</argument>
176176
<argument name="text">name=$createSecondBundleOption.option[title]$,type=$createSecondBundleOption.option[type]$,required=$createSecondBundleOption.option[required]$,sku=$$secondSimpleProductForFixed.sku$$</argument>
177177
</helper>
178-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedPriceBundleProduct">
179-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
178+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedPriceBundleProduct">
179+
<argument name="filePath">var/export/{$grabNameFile}</argument>
180180
<argument name="text">$$createFixedBundleProduct.price$$0000,,,,$$createFixedBundleProduct.sku$$</argument>
181181
</helper>
182182

183183
<!-- Validate Export File on File System: Fixed Bundle Product with Attribute -->
184-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForFixedBundledProductWithAttribute">
185-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
184+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForFixedBundledProductWithAttribute">
185+
<argument name="filePath">var/export/{$grabNameFile}</argument>
186186
<argument name="text">$$firstSimpleProductForFixedWithAttribute.name$$</argument>
187187
</helper>
188-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForFixedBundledProductWithAttribute">
189-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
188+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForFixedBundledProductWithAttribute">
189+
<argument name="filePath">var/export/{$grabNameFile}</argument>
190190
<argument name="text">$$secondSimpleProductForFixedWithAttribute.name$$</argument>
191191
</helper>
192-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedBundleProductWithAttribute">
193-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
192+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedBundleProductWithAttribute">
193+
<argument name="filePath">var/export/{$grabNameFile}</argument>
194194
<argument name="text">$$createFixedBundleProductWithAttribute.name$$</argument>
195195
</helper>
196-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedBundleProductWithAttributeOption1">
197-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
196+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedBundleProductWithAttributeOption1">
197+
<argument name="filePath">var/export/{$grabNameFile}</argument>
198198
<argument name="text">name=$createBundleOptionWithAttribute.option[title]$,type=$createBundleOptionWithAttribute.option[type]$,required=$createBundleOptionWithAttribute.option[required]$,sku=$$firstSimpleProductForFixedWithAttribute.sku$$</argument>
199199
</helper>
200-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedBundleProductWithAttributeOption2">
201-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
200+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedBundleProductWithAttributeOption2">
201+
<argument name="filePath">var/export/{$grabNameFile}</argument>
202202
<argument name="text">name=$createBundleOptionWithAttribute.option[title]$,type=$createBundleOptionWithAttribute.option[type]$,required=$createBundleOptionWithAttribute.option[required]$,sku=$$secondSimpleProductForFixedWithAttribute.sku$$</argument>
203203
</helper>
204-
<helper class="Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedPriceBundleProductWithAttribute">
205-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
204+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFixedPriceBundleProductWithAttribute">
205+
<argument name="filePath">var/export/{$grabNameFile}</argument>
206206
<argument name="text">$$createFixedBundleProductWithAttribute.price$$0000,,,,$$createFixedBundleProductWithAttribute.sku$$</argument>
207207
</helper>
208208

@@ -294,8 +294,8 @@
294294
<actionGroup ref="DeleteExportedFileActionGroup" stepKey="deleteExportedFile">
295295
<argument name="fileName" value="{$getFilename}"/>
296296
</actionGroup>
297-
<helper class="\Magento\FunctionalTestingFramework\Filesystem\Helper\FileAssertions" method="assertFileDoesNotExist" stepKey="assertExportFileDeleted">
298-
<argument name="filePath">{"local":"var/export/{$grabNameFile}","s3":"import_export/export/{$grabNameFile}"}</argument>
297+
<helper class="\Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileDoesNotExist" stepKey="assertExportFileDeleted">
298+
<argument name="filePath">var/export/{$grabNameFile}</argument>
299299
</helper>
300300
</test>
301301
</tests>

0 commit comments

Comments
 (0)