MQE-679: 2 or more params in a url are not properly replaced

MQE-877: Passing Multiple Element References In Selector Parameters Does Not Generate Correctly When Element(s) Are Parameterized

Author: okolesnyk

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

@@ -206,7 +206,7 @@ private function resolveUrlReference($urlIn, $entityObjects)
                         EntityDataObject::CEST_UNIQUE_VALUE
                     );
                     if (null !== $param) {
-                        $urlOut = str_replace($paramValue, $param, $urlIn);
+                        $urlOut = str_replace($paramValue, $param, $urlOut);
                         continue;
                     }
                 }

src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php

@@ -40,8 +40,7 @@ class ActionObject
     const ACTION_ATTRIBUTE_URL = 'url';
     const ACTION_ATTRIBUTE_SELECTOR = 'selector';
     const ACTION_ATTRIBUTE_VARIABLE_REGEX_PARAMETER = '/\(.+\)/';
-    const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/{{[\w]+\.?[\w\[\]]+}}/';
-    const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN_WITH_PARAMS= '/{{[\w]+\.[\w]+\(.+\)}}/';
+    const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/({{[\w]+\.?[\w\[\]]+}})|({{[\w]+\.[\w]+\(.+\)}})/';
 
     /**
      * The unique identifier for the action
@@ -444,7 +443,7 @@ private function stripAndReturnParameters($reference)
     private function findAndReplaceReferences($objectHandler, $inputString)
     {
         //look for parameter area, if so use different regex
-        $regex = $this->resolveRegexPatternForReference($inputString);
+        $regex = ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN;
 
         preg_match_all($regex, $inputString, $matches);
 
@@ -514,20 +513,6 @@ private function validateUrlAreaAgainstActionType($obj)
         }
     }
 
-    /**
-     * Determines whether the given $inputString has (params), and returns the appropriate regex for use in matching.
-     * @param string $inputString
-     * @return string
-     */
-    private function resolveRegexPatternForReference($inputString)
-    {
-        if (preg_match(ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN_WITH_PARAMS, $inputString) === 1) {
-            return ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN_WITH_PARAMS;
-        } else {
-            return ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN;
-        }
-    }
-
     /**
      * Gets the object's dataByName with given $match, differentiating behavior between <array> and <data> nodes.
      * @param string $obj