Merge pull request #250 from magento/MQE-910-develop

MQE-910: [GitHub] The property of the parent element is used first when making a request

Author: jilu1

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

@@ -197,15 +197,33 @@ private function resolveUrlReference($urlIn, $entityObjects)
     {
         $urlOut = $urlIn;
         $matchedParams = [];
+        // Find all the params ({}) references
         preg_match_all("/[{](.+?)[}]/", $urlIn, $matchedParams);
 
         if (!empty($matchedParams)) {
             foreach ($matchedParams[0] as $paramKey => $paramValue) {
+                $paramEntityParent = "";
+                $matchedParent = [];
+                $dataItem = $matchedParams[1][$paramKey];
+                // Find all the parent property (Type.key) references, assuming there will be only one
+                // parent property reference within one param
+                preg_match_all("/(.+?)\./", $dataItem, $matchedParent);
+
+                if (!empty($matchedParent) && !empty($matchedParent[0])) {
+                    $paramEntityParent = $matchedParent[1][0];
+                    $dataItem = preg_replace('/^'.$matchedParent[0][0].'/', '', $dataItem);
+                }
+
                 foreach ($entityObjects as $entityObject) {
-                    $param = $entityObject->getDataByName(
-                        $matchedParams[1][$paramKey],
-                        EntityDataObject::CEST_UNIQUE_VALUE
-                    );
+                    $param = null;
+
+                    if ($paramEntityParent === "" || $entityObject->getType() == $paramEntityParent) {
+                        $param = $entityObject->getDataByName(
+                            $dataItem,
+                            EntityDataObject::CEST_UNIQUE_VALUE
+                        );
+                    }
+
                     if (null !== $param) {
                         $urlOut = str_replace($paramValue, $param, $urlOut);
                         continue;