Merge branch 'develop' into MQE-1185

Author: jilu1

CHANGELOG.md

@@ -1,6 +1,22 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+2.3.10
+-----
+### Enhancements
+* Maintainability
+    * Added new `mftf run:failed` commands, which reruns all failed tests from last run configuration.
+    
+### Fixes
+* Fixed an issue where mftf would fail to parse test materials for extensions installed under `vendor`.
+* Fixed a Windows compatibility issue around the use of Magento's `ComponentRegistrar` to aggregate paths.
+* Fixed an issue where an `element` with no `type` would cause PHP warnings during test runs.
+
+2.3.9
+-----
+### Fixes
+* Logic for parallel execution were updated to split default tests and suites from running in one group.
+
 2.3.8
 -----
 ### Fixes

bin/mftf

@@ -29,7 +29,7 @@ try {
 try {
     $application = new Symfony\Component\Console\Application();
     $application->setName('Magento Functional Testing Framework CLI');
-    $application->setVersion('2.3.8');
+    $application->setVersion('2.3.10');
     /** @var \Magento\FunctionalTestingFramework\Console\CommandListInterface $commandList */
     $commandList = new \Magento\FunctionalTestingFramework\Console\CommandList;
     foreach ($commandList->getCommands() as $command) {

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "2.3.8",
+    "version": "2.3.10",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {

composer.lock

@@ -57,7 +57,13 @@ public function testGetModulePathsAlreadySet()
     public function testGetModulePathsAggregate()
     {
         $this->mockForceGenerate(false);
-        $this->setMockResolverClass(false, null, null, null, ["example" => "example" . DIRECTORY_SEPARATOR . "paths"]);
+        $this->setMockResolverClass(
+            false,
+            null,
+            null,
+            null,
+            ["Magento_example" => "example" . DIRECTORY_SEPARATOR . "paths"]
+        );
         $resolver = ModuleResolver::getInstance();
         $this->setMockResolverProperties($resolver, null, [0 => "Magento_example"]);
         $this->assertEquals(
@@ -79,7 +85,7 @@ public function testGetModulePathsLocations()
         $this->mockForceGenerate(false);
         $mockResolver = $this->setMockResolverClass(
             true,
-            [0 => "magento_example"],
+            [0 => "example"],
             null,
             null,
             ["example" => "example" . DIRECTORY_SEPARATOR . "paths"]

dev/tests/unit/Magento/FunctionalTestFramework/Util/ModuleResolverTest.php

@@ -98,13 +98,14 @@ public function testSortWithSuites()
         $actualResult = $testSorter->getTestsGroupedBySize($sampleSuiteArray, $sampleTestArray, 500);
 
         // verify the resulting groups
-        $this->assertCount(4, $actualResult);
+        $this->assertCount(5, $actualResult);
 
         $expectedResults =  [
-            1 => ['test3'],
-            2 => ['test2','test5', 'test4'],
-            3 => ['mockSuite1_0', 'test1'],
-            4 => ['mockSuite1_1']
+            1 => ['mockSuite1_0'],
+            2 => ['mockSuite1_1'],
+            3 => ['test3'],
+            4 => ['test2','test5', 'test4'],
+            5 => ['test1'],
         ];
 
         foreach ($actualResult as $groupNum => $group) {

dev/tests/unit/Magento/FunctionalTestFramework/Util/Sorter/ParallelGroupSorterTest.php

@@ -35,6 +35,7 @@ public function __construct(array $commands = [])
              'generate:tests' => new GenerateTestsCommand(),
              'run:test' => new RunTestCommand(),
              'run:group' => new RunTestGroupCommand(),
+             'run:failed' => new RunTestFailedCommand(),
              'setup:env' => new SetupEnvCommand(),
              'upgrade:tests' => new UpgradeTestsCommand(),
         ] + $commands;