Skip to content

Commit 7cd80db

Browse files
authored
Merge pull request #271 from magento/develop
MFTF 2.3.10 - Merge to Master
2 parents 9e0160e + 839377e commit 7cd80db

File tree

14 files changed

+317
-79
lines changed

14 files changed

+317
-79
lines changed

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
Magento Functional Testing Framework Changelog
22
================================================
33

4+
2.3.10
5+
-----
6+
### Enhancements
7+
* Maintainability
8+
* Added new `mftf run:failed` commands, which reruns all failed tests from last run configuration.
9+
10+
### Fixes
11+
* Fixed an issue where mftf would fail to parse test materials for extensions installed under `vendor`.
12+
* Fixed a Windows compatibility issue around the use of Magento's `ComponentRegistrar` to aggregate paths.
13+
* Fixed an issue where an `element` with no `type` would cause PHP warnings during test runs.
14+
15+
2.3.9
16+
-----
17+
### Fixes
18+
* Logic for parallel execution were updated to split default tests and suites from running in one group.
19+
420
2.3.8
521
-----
622
### Fixes

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
## Installation
88

9-
For the installation guidelines and system requirements, read [Getting Started](https://devdocs.magento.com/mftf/2.3/getting-started.html).
9+
For the installation guidelines and system requirements, refer to [Getting Started](https://devdocs.magento.com/mftf/2.3/getting-started.html).
1010

1111
## Contributing
1212

1313
We would appreciate your contributions to new components or new features, changes to the existing features, tests, documentation, specifications, bug fixes, optimizations, or just good suggestions.
1414
Report about an issue or request features opening a GitHub issue.
15-
Learn more about contributing in our [Contribution Guidelines](https://devdocs.magento.com/mftf/2.3/contribution-guidelines.html).
15+
Learn more about contributing in our [Contribution Guidelines](.github/CONTRIBUTING.md).
1616

1717
If you want to participate in the documentation work, see [DevDocs Contributing](https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md).
1818

bin/mftf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ try {
2929
try {
3030
$application = new Symfony\Component\Console\Application();
3131
$application->setName('Magento Functional Testing Framework CLI');
32-
$application->setVersion('2.3.8');
32+
$application->setVersion('2.3.10');
3333
/** @var \Magento\FunctionalTestingFramework\Console\CommandListInterface $commandList */
3434
$commandList = new \Magento\FunctionalTestingFramework\Console\CommandList;
3535
foreach ($commandList->getCommands() as $command) {

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "2.3.8",
5+
"version": "2.3.10",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {

composer.lock

Lines changed: 58 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,13 @@ public function testGetModulePathsAlreadySet()
5757
public function testGetModulePathsAggregate()
5858
{
5959
$this->mockForceGenerate(false);
60-
$this->setMockResolverClass(false, null, null, null, ["example" => "example" . DIRECTORY_SEPARATOR . "paths"]);
60+
$this->setMockResolverClass(
61+
false,
62+
null,
63+
null,
64+
null,
65+
["Magento_example" => "example" . DIRECTORY_SEPARATOR . "paths"]
66+
);
6167
$resolver = ModuleResolver::getInstance();
6268
$this->setMockResolverProperties($resolver, null, [0 => "Magento_example"]);
6369
$this->assertEquals(
@@ -79,7 +85,7 @@ public function testGetModulePathsLocations()
7985
$this->mockForceGenerate(false);
8086
$mockResolver = $this->setMockResolverClass(
8187
true,
82-
[0 => "magento_example"],
88+
[0 => "example"],
8389
null,
8490
null,
8591
["example" => "example" . DIRECTORY_SEPARATOR . "paths"]

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,14 @@ public function testSortWithSuites()
9898
$actualResult = $testSorter->getTestsGroupedBySize($sampleSuiteArray, $sampleTestArray, 500);
9999

100100
// verify the resulting groups
101-
$this->assertCount(4, $actualResult);
101+
$this->assertCount(5, $actualResult);
102102

103103
$expectedResults = [
104-
1 => ['test3'],
105-
2 => ['test2','test5', 'test4'],
106-
3 => ['mockSuite1_0', 'test1'],
107-
4 => ['mockSuite1_1']
104+
1 => ['mockSuite1_0'],
105+
2 => ['mockSuite1_1'],
106+
3 => ['test3'],
107+
4 => ['test2','test5', 'test4'],
108+
5 => ['test1'],
108109
];
109110

110111
foreach ($actualResult as $groupNum => $group) {

src/Magento/FunctionalTestingFramework/Console/CommandList.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public function __construct(array $commands = [])
3535
'generate:tests' => new GenerateTestsCommand(),
3636
'run:test' => new RunTestCommand(),
3737
'run:group' => new RunTestGroupCommand(),
38+
'run:failed' => new RunTestFailedCommand(),
3839
'setup:env' => new SetupEnvCommand(),
3940
'upgrade:tests' => new UpgradeTestsCommand(),
4041
] + $commands;

0 commit comments

Comments
 (0)