MQE-743: Can't run tests without a store having "default" store code

- CR Fixes

Author: KevinBKozan

src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php

@@ -76,7 +76,7 @@ public function __construct($storeCode = null)
      */
     protected function authorize()
     {
-        $authUrl = parent::$baseUrl . 'rest/' . $this->storeCode . trim(self::ADMIN_AUTH_URL, '/');
+        $authUrl = $this->getFormattedUrl(self::ADMIN_AUTH_URL);
         $authCreds = [
             'username' => getenv('MAGENTO_ADMIN_USERNAME'),
             'password' => getenv('MAGENTO_ADMIN_PASSWORD')
@@ -101,7 +101,7 @@ protected function authorize()
     public function write($url, $data = [], $method = CurlInterface::POST, $headers = [])
     {
         $this->transport->write(
-            parent::$baseUrl . 'rest/' . $this->storeCode  . trim($url, '/'),
+            $this->getFormattedUrl($url),
             json_encode($data, JSON_PRETTY_PRINT),
             $method,
             array_unique(array_merge($headers, $this->headers))
@@ -142,4 +142,19 @@ public function close()
     {
         $this->transport->close();
     }
+
+    /**
+     * Builds and returns URL for request, appending storeCode if needed.
+     * @param string $resource
+     * @return string
+     */
+    public function getFormattedUrl($resource)
+    {
+        $urlResult = parent::$baseUrl . 'rest/';
+        if ($this->storeCode != null) {
+            $urlResult .= $this->storeCode . "/";
+        }
+        $urlResult.= trim($resource, "/");
+        return $urlResult;
+    }
 }

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -438,6 +438,7 @@ public function generateStepsPhp($actionObjects, $hookObject = false, $actor = "
             $visible = null;
             $command = null;
             $sortOrder = null;
+            $storeCode = null;
 
             $assertExpected = null;
             $assertActual = null;
@@ -592,6 +593,9 @@ public function generateStepsPhp($actionObjects, $hookObject = false, $actor = "
                 $visible = $customActionAttributes['visible'];
             }
 
+            if (isset($customActionAttributes['storeCode'])) {
+                $storeCode = $customActionAttributes['storeCode'];
+            }
             switch ($actionObject->getType()) {
                 case "createData":
                     $entity = $customActionAttributes['entity'];
@@ -648,8 +652,8 @@ public function generateStepsPhp($actionObjects, $hookObject = false, $actor = "
                         );
                     }
 
-                    if (isset($customActionAttributes['storeCode'])) {
-                        $createEntityFunctionCall .= sprintf("\"%s\");\n", $customActionAttributes['storeCode']);
+                    if (isset($storeCode)) {
+                        $createEntityFunctionCall .= sprintf("\"%s\");\n", $storeCode);
                     } else {
                         $createEntityFunctionCall .= ");\n";
                     }
@@ -684,8 +688,8 @@ public function generateStepsPhp($actionObjects, $hookObject = false, $actor = "
                         $deleteEntityFunctionCall .= sprintf("\t\t$%s->deleteEntity(", $key);
                     }
 
-                    if (isset($customActionAttributes['storeCode'])) {
-                        $deleteEntityFunctionCall .= sprintf("\"%s\");\n", $customActionAttributes['storeCode']);
+                    if (isset($storeCode)) {
+                        $deleteEntityFunctionCall .= sprintf("\"%s\");\n", $storeCode);
                     } else {
                         $deleteEntityFunctionCall .= ");\n";
                     }
@@ -739,8 +743,8 @@ public function generateStepsPhp($actionObjects, $hookObject = false, $actor = "
                         );
                     }
 
-                    if (isset($customActionAttributes['storeCode'])) {
-                        $updateEntityFunctionCall .= sprintf(", \"%s\");\n", $customActionAttributes['storeCode']);
+                    if (isset($storeCode)) {
+                        $updateEntityFunctionCall .= sprintf(", \"%s\");\n", $storeCode);
                     } else {
                         $updateEntityFunctionCall .= ");\n";
                     }
@@ -806,8 +810,8 @@ public function generateStepsPhp($actionObjects, $hookObject = false, $actor = "
                         $getEntityFunctionCall .= 'null';
                     }
 
-                    if (isset($customActionAttributes['storeCode'])) {
-                        $getEntityFunctionCall .= sprintf(", \"%s\");\n", $customActionAttributes['storeCode']);
+                    if (isset($storeCode)) {
+                        $getEntityFunctionCall .= sprintf(", \"%s\");\n", $storeCode);
                     } else {
                         $getEntityFunctionCall .= ");\n";
                     }