Skip to content

Commit 3b88afa

Browse files
committed
MQE-975: Bump MFTF version in Magento and deliver all related changes to new version
- update composer.json and composer.lock version to ref new MFTF - update tests to utilize new logic - update RoboFile to utilize new parallel logic and suite generation
1 parent 62b7bc3 commit 3b88afa

File tree

9 files changed

+276
-936
lines changed

9 files changed

+276
-936
lines changed

dev/tests/acceptance/RoboFile.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ function generateTests(array $tests, $opts = [
117117
'config' => null,
118118
'force' => false,
119119
'nodes' => null,
120-
'lines' => null,
120+
'lines' => 500,
121121
'tests' => null
122122
])
123123
{
124124
require 'tests'. DIRECTORY_SEPARATOR . 'functional' . DIRECTORY_SEPARATOR . '_bootstrap.php';
125125
$testConfiguration = $this->createTestConfiguration($tests, $opts);
126126

127-
// maintain backwards compatability for devops
128-
$lines = $opts['lines'] ?? $opts ['nodes'];
127+
// maintain backwards compatability for devops by not removing the nodes option yet
128+
$lines = $opts['lines'];
129129

130130
// create our manifest file here
131131
$testManifest = \Magento\FunctionalTestingFramework\Util\Manifest\TestManifestFactory::makeManifest($opts['config'],$testConfiguration['suites']);

dev/tests/acceptance/composer.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,8 @@
1616
}
1717
],
1818
"require": {
19-
"allure-framework/allure-codeception": "~1.2.6",
20-
"codeception/codeception": "~2.3.4",
21-
"consolidation/robo": "^1.0.0",
22-
"symfony/process": ">=2.7 <3.4",
23-
"henrikbjorn/lurker": "^1.2",
24-
"magento/magento2-functional-testing-framework": "~2.1.1",
25-
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
26-
"vlucas/phpdotenv": "~2.4",
27-
"composer/composer": "1.4.1"
19+
"php": "~7.1.3||~7.2.0",
20+
"magento/magento2-functional-testing-framework": "~2.2.0"
2821
},
2922
"autoload": {
3023
"psr-4": {

0 commit comments

Comments
 (0)