- Fix assignment of correct value for object return property

 - Fix operation method receive

Author: ameysar

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

@@ -158,7 +158,10 @@ public function read($successRegex = null, $returnRegex = null)
         if (!empty($returnRegex)) {
             preg_match($returnRegex, $this->response, $returnMatches);
             if (!empty($returnMatches)) {
-                return $returnMatches;
+                if (count($returnMatches) > 1) {
+                    unset($returnMatches);
+                }
+                return reset($returnMatches);
             }
         }
         return $this->response;

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

@@ -179,7 +179,10 @@ public function read($successRegex = null, $returnRegex = null)
         if (!empty($returnRegex)) {
             preg_match($returnRegex, $this->response, $returnMatches);
             if (!empty($returnMatches)) {
-                return $returnMatches;
+                if (count($returnMatches) > 1) {
+                    unset($returnMatches);
+                }
+                return reset($returnMatches);
             }
         }
         return $this->response;

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

@@ -119,6 +119,7 @@ public function executeRequest($dependentEntities)
         $contentType = $this->operationDefinition->getContentType();
         $successRegex = $this->operationDefinition->getSuccessRegex();
         $returnRegex = $this->operationDefinition->getReturnRegex();
+        $method = $this->operationDefinition->getApiMethod();
 
         $operationDataResolver = new OperationDataArrayResolver($dependentEntities);
         $this->requestData = $operationDataResolver->resolveOperationDataArray(
@@ -156,7 +157,7 @@ public function executeRequest($dependentEntities)
         $executor->write(
             $apiUrl,
             $this->requestData,
-            self::$curlMethodMapping[$this->operation],
+            $method ?? self::$curlMethodMapping[$this->operation],
             $headers
         );
 

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

@@ -26,7 +26,7 @@
                         <xs:attribute type="xs:string" name="url"/>
                         <xs:attribute type="authEnum" name="auth"/>
                         <xs:attribute type="xs:boolean" name="removeBackend" use="optional" default="true"/>
-                        <xs:attribute type="xs:string" name="method"/>
+                        <xs:attribute type="operationMethodEnum" name="method"/>
                         <xs:attribute type="xs:string" name="successRegex"/>
                         <xs:attribute type="xs:string" name="returnRegex"/>
                         <xs:attribute type="xs:string" name="filename"/>
@@ -93,4 +93,12 @@
             <xs:enumeration value="anonymous" />
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="operationMethodEnum" final="restriction" >
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="GET" />
+            <xs:enumeration value="PUT" />
+            <xs:enumeration value="POST" />
+            <xs:enumeration value="DELETE" />
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>