Merge pull request #348 from zakdma/executeInSelenium2

executeInSelenium generation fix #2

Author: soumyau

dev/tests/verification/Resources/ExecuteInSeleniumTest.txt

@@ -28,6 +28,6 @@ class ExecuteInSeleniumTestCest
 	 */
 	public function ExecuteInSeleniumTest(AcceptanceTester $I)
 	{
-		$I->executeInSelenium(function ($webdriver) { return 'Hello, World!'}); // stepKey: executeInSeleniumStep
+		$I->executeInSelenium(function ($webdriver) { return "Hello, World!"}); // stepKey: executeInSeleniumStep
 	}
 }

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

@@ -9,6 +9,6 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="ExecuteInSeleniumTest">
-        <executeInSelenium function="function ($webdriver) { return 'Hello, World!'}" stepKey="executeInSeleniumStep"/>
+        <executeInSelenium function="function ($webdriver) { return &quot;Hello, World!&quot;}" stepKey="executeInSeleniumStep"/>
     </test>
 </tests>

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -654,7 +654,10 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
             }
 
             if (isset($customActionAttributes['function'])) {
-                $function = $this->addUniquenessFunctionCall($customActionAttributes['function']);
+                $function = $this->addUniquenessFunctionCall(
+                    $customActionAttributes['function'],
+                    $actionObject->getType() !== "executeInSelenium"
+                );
                 if (in_array($actionObject->getType(), ActionObject::FUNCTION_CLOSURE_ACTIONS)) {
                     // Argument must be a closure function, not a string.
                     $function = trim($function, '"');
@@ -1736,12 +1739,17 @@ private function processPressKey($input)
     /**
      * Add uniqueness function call to input string based on regex pattern.
      *
-     * @param string $input
+     * @param string  $input
+     * @param boolean $wrapWithDoubleQuotes
      * @return string
      */
-    private function addUniquenessFunctionCall($input)
+    private function addUniquenessFunctionCall($input, $wrapWithDoubleQuotes = true)
     {
-        $output = $this->wrapWithDoubleQuotes($input);
+        if ($wrapWithDoubleQuotes) {
+            $output = $this->wrapWithDoubleQuotes($input);
+        } else {
+            $output = $input;
+        }
 
         //Match on msq(\"entityName\")
         preg_match_all('/' . EntityDataObject::CEST_UNIQUE_FUNCTION . '\(\\\\"[\w]+\\\\"\)/', $output, $matches);