Merge pull request #2210 from magento-pangolin/2.3-develop-pangolin

okolesnyk · web-flow · commit 7b13100048ac · 2018-03-14T17:16:17.000+02:00
[Pangolin] Deliver changes related to MFTF 2.1.1 release
diff --git a/dev/tests/acceptance/RoboFile.php b/dev/tests/acceptance/RoboFile.php
@@ -43,7 +43,7 @@ function buildProject()
      * @param array $opts
      * @return void
      */
-    function generateTests($opts = ['config' => null, 'force' => false])
+    function generateTests($opts = ['config' => null, 'force' => false, 'nodes' => null])
     {
         $GLOBALS['GENERATE_TESTS'] = true;
 
@@ -53,7 +53,7 @@ function generateTests($opts = ['config' => null, 'force' => false])
         }
 
         require 'tests'. DIRECTORY_SEPARATOR . 'functional' . DIRECTORY_SEPARATOR . '_bootstrap.php';
-        \Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllTestFiles($opts['config']);
+        \Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllTestFiles($opts['config'], $opts['nodes']);
         $this->say("Generate Tests Command Run");
     }
 
diff --git a/dev/tests/acceptance/composer.json b/dev/tests/acceptance/composer.json
@@ -16,12 +16,12 @@
         }
     ],
     "require": {
-        "allure-framework/allure-codeception": "dev-master#af40af5ae2b717618a42fe3e137d75878508c75d",
+        "allure-framework/allure-codeception": "~1.2.6",
         "codeception/codeception": "~2.3.4",
         "consolidation/robo": "^1.0.0",
         "symfony/process": ">=2.7 <3.4",
         "henrikbjorn/lurker": "^1.2",
-        "magento/magento2-functional-testing-framework": "~2.1.0",
+        "magento/magento2-functional-testing-framework": "~2.1.1",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
         "vlucas/phpdotenv": "~2.4"
     },
diff --git a/dev/tests/acceptance/composer.lock b/dev/tests/acceptance/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ function buildProject()`
`43`	`43`	`* @param array $opts`
`44`	`44`	`* @return void`
`45`	`45`	`*/`
`46`		`- function generateTests($opts = ['config' => null, 'force' => false])`
	`46`	`+ function generateTests($opts = ['config' => null, 'force' => false, 'nodes' => null])`
`47`	`47`	`{`
`48`	`48`	`$GLOBALS['GENERATE_TESTS'] = true;`
`49`	`49`
`@@ -53,7 +53,7 @@ function generateTests($opts = ['config' => null, 'force' => false])`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`require 'tests'. DIRECTORY_SEPARATOR . 'functional' . DIRECTORY_SEPARATOR . '_bootstrap.php';`
`56`		`- \Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllTestFiles($opts['config']);`
	`56`	`+ \Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllTestFiles($opts['config'], $opts['nodes']);`
`57`	`57`	`$this->say("Generate Tests Command Run");`
`58`	`58`	`}`
`59`	`59`