Merge pull request #190 from magento/MQE-1153

MQE-1153: ExecuteJS javascript escaping matches persisted data

Author: aljcalandra

dev/tests/verification/Resources/ExecuteJsEscapingTest.txt

@@ -31,5 +31,8 @@ class ExecuteJsEscapingTestCest
 	{
 		$javaVariableEscape = $I->executeJS("return \$javascriptVariable");
 		$mftfVariableNotEscaped = $I->executeJS("return {$doNotEscape}");
+		$persistedDataNotEscaped = $I->executeJS("return " . $persisted->getCreatedDataByName('data'));
+		$hookPersistedDataNotEscaped = $I->executeJS("return " . $this->persisted->getCreatedDataByName('data'));
+		$addNewAttributeForRule = $I->executeJS("document.querySelector('entity option[value=" . $this->productAttribute->getCreatedDataByName('attribute_code') . "]').setAttribute('selected', 'selected')");
 	}
 }

dev/tests/verification/TestModule/Test/ExecuteJsTest.xml

@@ -11,5 +11,8 @@
     <test name="ExecuteJsEscapingTest">
         <executeJS function="return $javascriptVariable" stepKey="javaVariableEscape"/>
         <executeJS function="return {$doNotEscape}" stepKey="mftfVariableNotEscaped"/>
+        <executeJS function="return $persisted.data$" stepKey="persistedDataNotEscaped"/>
+        <executeJS function="return $$persisted.data$$" stepKey="hookPersistedDataNotEscaped"/>
+        <executeJS function="document.querySelector('entity option[value=$$productAttribute.attribute_code$$]').setAttribute('selected', 'selected')" stepKey="addNewAttributeForRule"/>
     </test>
 </tests>

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -624,7 +624,7 @@ public function generateStepsPhp($actionObjects, $hookObject = false, $actor = "
                 }
                 // turn $javaVariable => \$javaVariable but not {$mftfVariable}
                 if ($actionObject->getType() == "executeJS") {
-                    $function = preg_replace('/(?<!{)(\$[\w\d_]+)/', '\\\\$1', $function);
+                    $function = preg_replace('/(?<!{)(\$[A-Za-z._]+)(?![A-z.]*+\$)/', '\\\\$1', $function);
                 }
             }