Merge branch 'MQE-651' into develop

Author: jilu1

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

@@ -70,7 +70,7 @@ public function __construct($storeCode = 'default')
      *
      * @return void
      */
-    private function authorize()
+    protected function authorize()
     {
         $authUrl = parent::$baseUrl . 'rest/' . $this->storeCode . self::ADMIN_AUTH_URL;
         $authCreds = [

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

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\FunctionalTestingFramework\DataGenerator\Persist\Curl;
+
+/**
+ * Curl executor for Magento Web Api requests that do not require authorization.
+ */
+class WebapiNoAuthExecutor extends WebapiExecutor
+{
+    /**
+     * No authorization is needed and just return.
+     *
+     * @return void
+     */
+    protected function authorize()
+    {
+        //NOP
+    }
+}

src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php

@@ -8,6 +8,7 @@
 use Magento\FunctionalTestingFramework\DataGenerator\Persist\Curl\AdminExecutor;
 use Magento\FunctionalTestingFramework\DataGenerator\Persist\Curl\FrontendExecutor;
 use Magento\FunctionalTestingFramework\DataGenerator\Persist\Curl\WebapiExecutor;
+use Magento\FunctionalTestingFramework\DataGenerator\Persist\Curl\WebapiNoAuthExecutor;
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\OperationDefinitionObjectHandler;
 use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
 use Magento\FunctionalTestingFramework\DataGenerator\Objects\OperationDefinitionObject;
@@ -136,6 +137,9 @@ public function executeRequest($dependentEntities)
                 $this->requestData['customer_email'],
                 $this->requestData['customer_password']
             );
+        } elseif ($authorization === 'anonymous') {
+            $this->isJson = true;
+            $executor = new WebapiNoAuthExecutor($this->storeCode);
         }
 
         if (!$executor) {

src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php

@@ -184,13 +184,10 @@ private function setCreatedObject($response, $index, $requestDataArray, $isJson)
             if (is_array($responseData)) {
                 $persistedData = $this->convertToFlatArray(array_merge($requestDataArray, $responseData));
             } else {
-                $persistedData = $requestDataArray;
+                $persistedData = $this->convertToFlatArray(array_merge($requestDataArray, ['return' => $responseData]));
             }
         } else {
-            $persistedData = array_merge(
-                $this->convertToFlatArray($requestDataArray),
-                ['return' => $response]
-            );
+            $persistedData = array_merge($this->convertToFlatArray($requestDataArray), ['return' => $response]);
         }
 
         $this->createdObject = new EntityDataObject(

src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd

@@ -88,6 +88,7 @@
             <xs:enumeration value="adminOauth" />
             <xs:enumeration value="adminFormKey" />
             <xs:enumeration value="customerFormKey" />
+            <xs:enumeration value="anonymous" />
         </xs:restriction>
     </xs:simpleType>
 </xs:schema>