B2B-1704: Add MFTF test for MC-38621

 - Addressing CR feedback

Author: dhaecker

app/code/Magento/Catalog/Test/Mftf/Helper/CurlHelpers.php

@@ -19,14 +19,14 @@ class CurlHelpers extends Helper
      *
      * @param string $url
      * @param string $expectedString
-     * @param string $formKey
+     * @param string $postBody
      * @return void
      *
      */
-    public function assertCurlResponseContainsString($url, $expectedString, $formKey = null): void
+    public function assertCurlResponseContainsString($url, $expectedString, $postBody = null): void
     {
         $cookie = $this->getCookie('admin');
-        $curlResponse = $this->getCurlResponse($url, $cookie, $formKey);
+        $curlResponse = $this->getCurlResponse($url, $cookie, $postBody);
         $this->assertStringContainsString($expectedString, $curlResponse);
     }
 
@@ -35,20 +35,18 @@ public function assertCurlResponseContainsString($url, $expectedString, $formKey
      *
      * @param string $url
      * @param string $cookie
-     * @param string $formKey
+     * @param string $postBody
      * @return string
      *
      */
-    public function getCurlResponse($url, $cookie = null, $formKey = null): string
+    private function getCurlResponse($url, $cookie = null, $postBody = null): string
     {
         // Start Session
         $session = curl_init($url);
 
         // Set Options
-        if ($formKey) {
-            $data = [
-                'form_key' => $formKey
-            ];
+        if ($postBody) {
+            $data = json_decode($postBody);
             curl_setopt($session, CURLOPT_POST, true);
             curl_setopt($session, CURLOPT_POSTFIELDS, $data);
         }
@@ -69,7 +67,7 @@ public function getCurlResponse($url, $cookie = null, $formKey = null): string
      * @return string
      *
      */
-    public function getCookie($cookieName = 'admin'): string
+    private function getCookie($cookieName = 'admin'): string
     {
         try {
             $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');

app/code/Magento/TaxImportExport/Test/Mftf/ActionGroup/AdminExportTaxRatesActionGroup.xml

@@ -14,6 +14,6 @@
         </annotations>
         <waitForElementVisible selector="{{AdminImportExportTaxRatesSection.exportTaxRatesButton}}" stepKey="waitForExportTaxRates"/>
         <click selector="{{AdminImportExportTaxRatesSection.exportTaxRatesButton}}" stepKey="clickExportTaxRates"/>
-        <waitForPageLoad stepKey="waitForImport"/>
+        <waitForPageLoad stepKey="waitForExport"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/TaxImportExport/Test/Mftf/Test/AdminExportTaxRatesTest.xml

@@ -46,12 +46,12 @@
         <executeJS function="return window.FORM_KEY" stepKey="grabFormKey"/>
         <helper class="\Magento\Catalog\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertExportedFileContainsCATaxRate">
             <argument name="url">{$grabExportUrl}</argument>
-            <argument name="formKey">{$grabFormKey}</argument>
+            <argument name="postBody">{"form_key": "{$grabFormKey}"}</argument>
             <argument name="expectedString">{{US_CA_Rate_1.code}}</argument>
         </helper>
         <helper class="\Magento\Catalog\Test\Mftf\Helper\CurlHelpers" method="assertCurlResponseContainsString" stepKey="assertExportedFileContainsNYTaxRate">
             <argument name="url">{$grabExportUrl}</argument>
-            <argument name="formKey">{$grabFormKey}</argument>
+            <argument name="postBody">{"form_key": "{$grabFormKey}"}</argument>
             <argument name="expectedString">{{US_NY_Rate_1.code}}</argument>
         </helper>
     </test>