Merge branch 'develop' into custom-domain-backend

Author: okolesnyk

CHANGELOG.md

@@ -1,6 +1,11 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+2.3.11
+-----
+### Fixes
+* `mftf run:failed` now correctly regenerates tests that are in suites that were parallelized (`suite` => `suite_0`, `suite_1`)
+
 2.3.10
 -----
 ### Enhancements
@@ -9,6 +14,7 @@ Magento Functional Testing Framework Changelog
 
 ### 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

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.10');
+    $application->setVersion('2.3.11');
     /** @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.10",
+    "version": "2.3.11",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
@@ -30,6 +30,7 @@
         "goaop/framework": "2.2.0",
         "codacy/coverage": "^1.4",
         "phpmd/phpmd": "^2.6.0",
+        "phpunit/phpunit": "~6.5.0 || ~7.0.0",
         "rregeer/phpunit-coverage-check": "^0.1.4",
         "php-coveralls/php-coveralls": "^1.0",
         "symfony/stopwatch": "~3.4.6"

composer.lock

@@ -82,7 +82,8 @@
 
 $paths = [
     $suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuite.xml',
-    $suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuiteHooks.xml'
+    $suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuiteHooks.xml',
+    $suiteDirectory . DIRECTORY_SEPARATOR . 'functionalSuiteExtends.xml'
 ];
 
 // create and return the iterator for these file paths