MQE-809: Throw a warning or error when step key referencing in merges is invalid or ambiguous

imeron2433 · imeron2433 · commit 9d03330d5ad2 · 2018-04-15T17:49:17.000-05:00
- undo edits to wrong Robofile
diff --git a/RoboFile.php b/RoboFile.php
@@ -49,7 +49,6 @@ function generateTests(array $tests, $opts = ['config' => null, 'force' => true,
     {
         require 'dev' . DIRECTORY_SEPARATOR . 'tests'. DIRECTORY_SEPARATOR . 'functional' . DIRECTORY_SEPARATOR . '_bootstrap.php';
         $GLOBALS['GENERATE_TESTS'] = true;
-
         if (!$this->isProjectBuilt()) {
             $this->say("<info>Please run bin/mftf build:project and configure your environment (.env) first.</info>");
             exit(\Robo\Result::EXITCODE_ERROR);

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ function generateTests(array $tests, $opts = ['config' => null, 'force' => true,`
`49`	`49`	`{`
`50`	`50`	`require 'dev' . DIRECTORY_SEPARATOR . 'tests'. DIRECTORY_SEPARATOR . 'functional' . DIRECTORY_SEPARATOR . '_bootstrap.php';`
`51`	`51`	`$GLOBALS['GENERATE_TESTS'] = true;`
`52`		`-`
`53`	`52`	`if (!$this->isProjectBuilt()) {`
`54`	`53`	`$this->say("<info>Please run bin/mftf build:project and configure your environment (.env) first.</info>");`
`55`	`54`	`exit(\Robo\Result::EXITCODE_ERROR);`