Merge branch 'develop' into MQE-1059

Author: imeron2433

dev/tests/verification/Resources/DataReplacementTest.txt

@@ -51,5 +51,7 @@ class DataReplacementTestCest
 		$I->searchAndMultiSelectOption("#selector", [msq("uniqueData") . "John", "Doe" . msq("uniqueData")]);
 		$I->selectMultipleOptions("#Doe" . msq("uniqueData"), "#element", [msq("uniqueData") . "John", "Doe" . msq("uniqueData")]);
 		$I->fillField(".selector", "0");
+		$insertCommand = $I->magentoCLI("do something Doe" . msq("uniqueData") . " with uniqueness");
+		$I->comment($insertCommand);
 	}
 }

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

@@ -37,5 +37,6 @@
         </selectMultipleOptions>
 
         <fillField stepKey="insertZero" selector=".selector" userInput="{{simpleData.favoriteIndex}}"/>
+        <magentoCLI stepKey="insertCommand" command="do something {{uniqueData.lastname}} with uniqueness"/>
     </test>
 </tests>

src/Magento/FunctionalTestingFramework/Console/BuildProjectCommand.php

@@ -76,6 +76,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $codeceptBuildCommand = realpath(PROJECT_ROOT . '/vendor/bin/codecept') .  ' build';
         $process = new Process($codeceptBuildCommand);
         $process->setWorkingDirectory(TESTS_BP);
+        $process->setIdleTimeout(600);
+        $process->setTimeout(0);
         $process->run(
             function ($type, $buffer) use ($output) {
                 if ($output->isVerbose()) {

src/Magento/FunctionalTestingFramework/Console/RunTestCommand.php

@@ -63,11 +63,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $process = new Process($codeceptionCommand);
         $process->setWorkingDirectory(TESTS_BP);
+        $process->setIdleTimeout(600);
+        $process->setTimeout(0);
         $process->run(
             function ($type, $buffer) use ($output) {
                 $output->write($buffer);
             }
         );
     }
-
 }

src/Magento/FunctionalTestingFramework/Console/RunTestGroupCommand.php

@@ -68,6 +68,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $process = new Process($codeceptionCommand);
         $process->setWorkingDirectory(TESTS_BP);
+        $process->setIdleTimeout(600);
+        $process->setTimeout(0);
         $process->run(
             function ($type, $buffer) use ($output) {
                 $output->write($buffer);

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

@@ -31,7 +31,8 @@ class ActionObject
         "x",
         "y",
         "expectedResult",
-        "actualResult"
+        "actualResult",
+        "command"
     ];
     const SELECTOR_ENABLED_ATTRIBUTES = [
         'selector',
@@ -40,7 +41,8 @@ class ActionObject
         "selector2",
         "function",
         'filterSelector',
-        'optionSelector'
+        'optionSelector',
+        "command"
     ];
     const OLD_ASSERTION_ATTRIBUTES = ["expected", "expectedType", "actual", "actualType"];
     const ASSERTION_ATTRIBUTES = ["expectedResult" => "expected", "actualResult" => "actual"];

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -500,7 +500,7 @@ public function generateStepsPhp($actionObjects, $hookObject = false, $actor = "
             $this->validateXmlAttributesMutuallyExclusive($stepKey, $actionObject->getType(), $customActionAttributes);
 
             if (isset($customActionAttributes['command'])) {
-                $command = $customActionAttributes['command'];
+                $command = $this->addUniquenessFunctionCall($customActionAttributes['command']);
             }
 
             if (isset($customActionAttributes['attribute'])) {
@@ -1217,7 +1217,7 @@ public function generateStepsPhp($actionObjects, $hookObject = false, $actor = "
                         $stepKey,
                         $actor,
                         $actionObject,
-                        $this->wrapWithDoubleQuotes($command)
+                        $command
                     );
                     $testSteps .= sprintf(
                         "\t\t$%s->comment(\$%s);\n",