Skip to content

Commit d9411c3

Browse files
dhaeckerdhaecker
committed
B2B-1703: Add MFTF test for MC-38558
 - Addressing CR feedback
1 parent 59e146a commit d9411c3

12 files changed

+55
-54
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileExists" stepKey="assertExportFileExists">
4545
<argument name="filePath">import_export/export/{$grabNameFile}</argument>
4646
</helper>
47-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForDynamic">
47+
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForDynamicBundledProduct">
4848
<argument name="filePath">import_export/export/{$grabNameFile}</argument>
4949
<argument name="text">$$firstSimpleProductForDynamic.name$$</argument>
5050
</helper>
51-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForDynamic">
51+
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForDynamicBundledProduct">
5252
<argument name="filePath">import_export/export/{$grabNameFile}</argument>
5353
<argument name="text">$$secondSimpleProductForDynamic.name$$</argument>
5454
</helper>
@@ -70,11 +70,11 @@
7070
</helper>
7171

7272
<!-- Validate Export File on File System: Fixed Bundle Product -->
73-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForFixed">
73+
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForFixedBundledProduct">
7474
<argument name="filePath">import_export/export/{$grabNameFile}</argument>
7575
<argument name="text">$$firstSimpleProductForFixed.name$$</argument>
7676
</helper>
77-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForFixed">
77+
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForFixedBundledProduct">
7878
<argument name="filePath">import_export/export/{$grabNameFile}</argument>
7979
<argument name="text">$$secondSimpleProductForFixed.name$$</argument>
8080
</helper>
@@ -96,11 +96,11 @@
9696
</helper>
9797

9898
<!-- Validate Export File on File System: Fixed Bundle Product with Attribute -->
99-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForFixedWithAttribute">
99+
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForFixedBundledProductWithAttribute">
100100
<argument name="filePath">import_export/export/{$grabNameFile}</argument>
101101
<argument name="text">$$firstSimpleProductForFixedWithAttribute.name$$</argument>
102102
</helper>
103-
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForFixedWithAttribute">
103+
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForFixedBundledProductWithAttribute">
104104
<argument name="filePath">import_export/export/{$grabNameFile}</argument>
105105
<argument name="text">$$secondSimpleProductForFixedWithAttribute.name$$</argument>
106106
</helper>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<title value="S3 - Export Downloadable Products with File Links"/>
1616
<description value="Verifies that a user can export a Downloadable product with downloadable and sample file
1717
links. Verifies that the exported file and the downloadable copy of the exported file contain the expected
18-
product (a filter is applied when exporting such that ONLY the downloadable product should be in the
18+
product (a filter is applied when exporting such that ONLY the downloadable product row should be in the
1919
export), the correct downloadable link with files, and the correct downloadable sample links with files.
2020
Note that MFTF cannot simply download a file and have access to it due to the test not having access to the
2121
server that is running the test browser. Therefore, this test verifies that the Download button can be

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<title value="S3 - Export Downloadable Products with URL Links"/>
1616
<description value="Verifies that a user can export a Downloadable product with downloadable and sample Url
1717
links. Verifies that the exported file and the downloadable copy of the exported file contain the expected
18-
product (a filter is applied when exporting such that ONLY the configurable product should be in the
18+
product (a filter is applied when exporting such that ONLY the configurable product row should be in the
1919
export), the correct downloadable link with Urls, and the correct downloadable sample links with Urls.
2020
Note that MFTF cannot simply download a file and have access to it due to the test not having access to the
2121
server that is running the test browser. Therefore, this test verifies that the Download button can be

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
4141
</after>
4242

43-
<!-- Validate Export File on S3 -->
43+
<!-- Validate Export File on S3: Grouped Product with Special Price -->
4444
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileExists" stepKey="assertExportFileExists">
4545
<argument name="filePath">import_export/export/{$grabNameFile}</argument>
4646
</helper>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
<title value="S3 - Export Simple and Configurable Products with Custom Options"/>
1616
<description value="Verifies that a user can export a Configurable product with child simple products with
1717
custom options. Verifies that the exported file and the downloadable copy of the exported file contain the
18-
expected product (a filter is applied when exporting such that ONLY the configurable product should be in
19-
the export). Note that MFTF cannot simply download a file and have access to it due to the test not having
20-
access to the server that is running the test browser. Therefore, this test verifies that the Download
21-
button can be successfully clicked, grabs the request URL from the Download button, executes the request on
22-
the magento machine via a curl request, and verifies the contents of the downloaded file. Uses S3 for the
23-
file system."/>
18+
expected product (a filter is applied when exporting such that ONLY the configurable product row should be
19+
in the export). Note that MFTF cannot simply download a file and have access to it due to the test not
20+
having access to the server that is running the test browser. Therefore, this test verifies that the
21+
Download button can be successfully clicked, grabs the request URL from the Download button, executes the
22+
request on the magento machine via a curl request, and verifies the contents of the downloaded file. Uses
23+
S3 for the file system."/>
2424
<severity value="CRITICAL"/>
2525
<testCaseId value="MC-38558"/>
2626
<group value="importExport"/>
@@ -41,7 +41,7 @@
4141
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
4242
</after>
4343

44-
<!-- Validate Export File on S3 -->
44+
<!-- Validate Export File on S3: Product with Custom Options -->
4545
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileExists" stepKey="assertExportFileExists">
4646
<argument name="filePath">import_export/export/{$grabNameFile}</argument>
4747
</helper>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
<title value="S3 - Export Simple product and Configurable products with assigned images"/>
1616
<description value="Verifies that a user can export a Configurable product with child simple products with
1717
images. Verifies that the exported file and the downloadable copy of the exported file contain the expected
18-
product (a filter is applied when exporting such that ONLY the configurable product should be in the export)
19-
and the attached image. Note that MFTF cannot simply download a file and have access to it due to the test
20-
not having access to the server that is running the test browser. Therefore, this test verifies that the
21-
Download button can be successfully clicked, grabs the request URL from the Download button, executes the
22-
request on the magento machine via a curl request, and verifies the contents of the downloaded file. Uses
23-
S3 for the file system."/>
18+
product (a filter is applied when exporting such that ONLY the configurable product row should be in the
19+
export) and the attached image. Note that MFTF cannot simply download a file and have access to it due to
20+
the test not having access to the server that is running the test browser. Therefore, this test verifies
21+
that the Download button can be successfully clicked, grabs the request URL from the Download button,
22+
executes the request on the magento machine via a curl request, and verifies the contents of the downloaded
23+
file. Uses S3 for the file system."/>
2424
<severity value="CRITICAL"/>
2525
<testCaseId value="MC-38558"/>
2626
<group value="importExport"/>
@@ -41,7 +41,7 @@
4141
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
4242
</after>
4343

44-
<!-- Validate Export File on S3 -->
44+
<!-- Validate Export File on S3: Configurable Product -->
4545
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="assertFileExists" stepKey="assertExportFileExists">
4646
<argument name="filePath">import_export/export/{$grabNameFile}</argument>
4747
</helper>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@
126126
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileExists" stepKey="assertExportFileExists">
127127
<argument name="filePath">var/export/{$grabNameFile}</argument>
128128
</helper>
129-
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForDynamic">
129+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForDynamicBundledProduct">
130130
<argument name="filePath">var/export/{$grabNameFile}</argument>
131131
<argument name="text">$$firstSimpleProductForDynamic.name$$</argument>
132132
</helper>
133-
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForDynamic">
133+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForDynamicBundledProduct">
134134
<argument name="filePath">var/export/{$grabNameFile}</argument>
135135
<argument name="text">$$secondSimpleProductForDynamic.name$$</argument>
136136
</helper>
@@ -152,11 +152,11 @@
152152
</helper>
153153

154154
<!-- Validate Export File on File System: Fixed Bundle Product -->
155-
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForFixed">
155+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForFixedBundledProduct">
156156
<argument name="filePath">var/export/{$grabNameFile}</argument>
157157
<argument name="text">$$firstSimpleProductForFixed.name$$</argument>
158158
</helper>
159-
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForFixed">
159+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForFixedBundledProduct">
160160
<argument name="filePath">var/export/{$grabNameFile}</argument>
161161
<argument name="text">$$secondSimpleProductForFixed.name$$</argument>
162162
</helper>
@@ -178,11 +178,11 @@
178178
</helper>
179179

180180
<!-- Validate Export File on File System: Fixed Bundle Product with Attribute -->
181-
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForFixedWithAttribute">
181+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsFirstSimpleProductForFixedBundledProductWithAttribute">
182182
<argument name="filePath">var/export/{$grabNameFile}</argument>
183183
<argument name="text">$$firstSimpleProductForFixedWithAttribute.name$$</argument>
184184
</helper>
185-
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForFixedWithAttribute">
185+
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileContainsString" stepKey="assertExportFileContainsSecondSimpleProductForFixedBundledProductWithAttribute">
186186
<argument name="filePath">var/export/{$grabNameFile}</argument>
187187
<argument name="text">$$secondSimpleProductForFixedWithAttribute.name$$</argument>
188188
</helper>
@@ -210,11 +210,11 @@
210210

211211
<!-- Validate Downloaded Export File on File System: Dynamic Bundle Product -->
212212
<grabAttributeFrom userInput="href" selector="{{AdminExportAttributeSection.download('0')}}" stepKey="grabExportUrl"/>
213-
<helper class="\Magento\Backend\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertDownloadFileContainsFirstSimpleProductForDynamic">
213+
<helper class="\Magento\Backend\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertDownloadFileContainsFirstSimpleProductForDynamicBundledProduct">
214214
<argument name="url">{$grabExportUrl}</argument>
215215
<argument name="expectedString">$$firstSimpleProductForDynamic.name$$</argument>
216216
</helper>
217-
<helper class="\Magento\Backend\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertDownloadFileContainsSecondSimpleProductForDynamic">
217+
<helper class="\Magento\Backend\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertDownloadFileContainsSecondSimpleProductForDynamicBundledProduct">
218218
<argument name="url">{$grabExportUrl}</argument>
219219
<argument name="expectedString">$$secondSimpleProductForDynamic.name$$</argument>
220220
</helper>
@@ -236,11 +236,11 @@
236236
</helper>
237237

238238
<!-- Validate Downloaded Export File on File System: Fixed Bundle Product -->
239-
<helper class="\Magento\Backend\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertDownloadFileContainsFirstSimpleProductForFixed">
239+
<helper class="\Magento\Backend\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertDownloadFileContainsFirstSimpleProductForFixedBundledProduct">
240240
<argument name="url">{$grabExportUrl}</argument>
241241
<argument name="expectedString">$$firstSimpleProductForFixed.name$$</argument>
242242
</helper>
243-
<helper class="\Magento\Backend\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertDownloadFileContainsSecondSimpleProductForFixed">
243+
<helper class="\Magento\Backend\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertDownloadFileContainsSecondSimpleProductForFixedBundledProduct">
244244
<argument name="url">{$grabExportUrl}</argument>
245245
<argument name="expectedString">$$secondSimpleProductForFixed.name$$</argument>
246246
</helper>
@@ -262,11 +262,11 @@
262262
</helper>
263263

264264
<!-- Validate Downloaded Export File on File System: Fixed Bundle Product with Attribute -->
265-
<helper class="\Magento\Backend\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertDownloadFileContainsFirstSimpleProductForFixedWithAttribute">
265+
<helper class="\Magento\Backend\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertDownloadFileContainsFirstSimpleProductForFixedBundledProductWithAttribute">
266266
<argument name="url">{$grabExportUrl}</argument>
267267
<argument name="expectedString">$$firstSimpleProductForFixedWithAttribute.name$$</argument>
268268
</helper>
269-
<helper class="\Magento\Backend\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertDownloadFileContainsSecondSimpleProductForFixedWithAttribute">
269+
<helper class="\Magento\Backend\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertDownloadFileContainsSecondSimpleProductForFixedBundledProductWithAttribute">
270270
<argument name="url">{$grabExportUrl}</argument>
271271
<argument name="expectedString">$$secondSimpleProductForFixedWithAttribute.name$$</argument>
272272
</helper>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<waitForElementVisible selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="waitForFileName"/>
8686
<grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
8787

88-
<!-- Validate Export File on File System -->
88+
<!-- Validate Export File on File System: Grouped Product with Special Price -->
8989
<helper class="Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="assertFileExists" stepKey="assertExportFileExists">
9090
<argument name="filePath">var/export/{$grabNameFile}</argument>
9191
</helper>
@@ -115,9 +115,9 @@
115115
<argument name="fileName" value="{$grabNameFile}"/>
116116
</actionGroup>
117117

118-
<!-- Validate Downloaded Export File -->
118+
<!-- Validate Downloaded Export File: Grouped Product with Special Price -->
119119
<grabAttributeFrom userInput="href" selector="{{AdminExportAttributeSection.download('0')}}" stepKey="grabExportUrl"/>
120-
<helper class="\Magento\Backend\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertDownloadFileContainsFirstSimpleProductc">
120+
<helper class="\Magento\Backend\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertDownloadFileContainsFirstSimpleProduct">
121121
<argument name="url">{$grabExportUrl}</argument>
122122
<argument name="expectedString">$$createFirstSimpleProduct.name$$</argument>
123123
</helper>

0 commit comments

Comments
 (0)