Merge branch 'develop' into MQE-1055

Author: tomreece

src/Magento/FunctionalTestingFramework/Console/GenerateTestsCommand.php

@@ -123,7 +123,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * @throws \Magento\FunctionalTestingFramework\Exceptions\XmlException
      */
     private function createTestConfiguration(
-        string $json,
+        $json,
         array $tests,
         bool $force,
         string $debug,

src/Magento/FunctionalTestingFramework/Console/RunTestCommand.php

@@ -8,6 +8,7 @@
 namespace Magento\FunctionalTestingFramework\Console;
 
 use Magento\FunctionalTestingFramework\Config\MftfApplicationConfig;
+use Magento\FunctionalTestingFramework\Util\TestGenerator;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -77,18 +78,30 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $command->run(new ArrayInput($args), $output);
         }
 
-        // we only generate relevant tests here so we can execute "all tests"
-        $codeceptionCommand = realpath(PROJECT_ROOT . '/vendor/bin/codecept') . " run functional --verbose --steps";
-
-        $process = new Process($codeceptionCommand);
-        $process->setWorkingDirectory(TESTS_BP);
-        $process->setIdleTimeout(600);
-        $process->setTimeout(0);
-
-        return $process->run(
-            function ($type, $buffer) use ($output) {
-                $output->write($buffer);
+        $returnCode = 0;
+        $codeceptionCommand = realpath(PROJECT_ROOT . '/vendor/bin/codecept') . ' run functional ';
+        $testsDirectory = TESTS_MODULE_PATH . DIRECTORY_SEPARATOR . TestGenerator::GENERATED_DIR . DIRECTORY_SEPARATOR;
+        //execute only tests specified as arguments in run command
+        foreach ($tests as $test) {
+            $testGroup = TestGenerator::DEFAULT_DIR . DIRECTORY_SEPARATOR;
+            $testName = $test . 'Cest.php';
+            if (!realpath($testsDirectory . $testGroup . $testName)) {
+                throw new TestFrameworkException(
+                    $testName . " is not available under " . $testsDirectory . $testGroup
+                );
             }
-        );
+            $fullCommand = $codeceptionCommand . $testsDirectory . $testGroup . $testName . ' --verbose --steps';
+            $process = new Process($fullCommand);
+            $process->setWorkingDirectory(TESTS_BP);
+            $process->setIdleTimeout(600);
+            $process->setTimeout(0);
+
+            $returnCode = max($returnCode, $process->run(
+                function ($type, $buffer) use ($output) {
+                    $output->write($buffer);
+                }
+            ));
+        }
+        return $returnCode;
     }
 }