MQE-231: Allow data to extend other data

- Merged Develop into branch

Author: aljcalandra

RoboFile.php

@@ -11,13 +11,27 @@ if (PHP_SAPI !== 'cli') {
     exit(1);
 }
 
+$autoload_path = realpath(__DIR__ . '/../../../autoload.php');
+$test_bootstrap_path = realpath(__DIR__ . '/../dev/tests/functional/_bootstrap.php');
+
+if (file_exists($autoload_path)) {
+    require_once $autoload_path;
+} else {
+    require_once $test_bootstrap_path;
+}
+
+
 try {
-    require_once __DIR__ . '/../bootstrap.php';
     $application = new Symfony\Component\Console\Application();
     $application->setName('Magento Functional Testing Framework CLI');
     $application->setVersion('1.0.0');
     $application->add(new Magento\FunctionalTestingFramework\Console\SetupEnvCommand());
+    $application->add(new Magento\FunctionalTestingFramework\Console\CleanProjectCommand());
     $application->add(new Magento\FunctionalTestingFramework\Console\BuildProjectCommand());
+    $application->add(new Magento\FunctionalTestingFramework\Console\GenerateSuiteCommand());
+    $application->add(new Magento\FunctionalTestingFramework\Console\GenerateTestsCommand());
+    $application->add(new Magento\FunctionalTestingFramework\Console\RunTestGroupCommand());
+    $application->add(new Magento\FunctionalTestingFramework\Console\RunTestCommand());
     $application->run();
 } catch (\Exception $e) {
     while ($e) {

bin/mftf

@@ -16,6 +16,7 @@
         "epfremme/swagger-php": "^2.0",
         "flow/jsonpath": ">0.2",
         "fzaninotto/faker": "^1.6",
+        "monolog/monolog": "^1.0",
         "mustache/mustache": "~2.5",
         "symfony/process": "^2.8 || ^3.1 || ^4.0",
         "vlucas/phpdotenv": "^2.4"
@@ -34,6 +35,7 @@
         "symfony/stopwatch": "~3.4.6"
     },
     "autoload": {
+        "files": ["src/Magento/FunctionalTestingFramework/_bootstrap.php"],
         "psr-4": {
             "Magento\\FunctionalTestingFramework\\": "src/Magento/FunctionalTestingFramework",
             "MFTF\\": "dev/tests/functional/MFTF"

bootstrap.php

@@ -6,14 +6,18 @@
 
 error_reporting(~E_USER_NOTICE);
 define('PROJECT_ROOT', dirname(dirname(__DIR__)));
-require_once PROJECT_ROOT . '/vendor/autoload.php';
-require_once 'util/MftfTestCase.php';
+
+$vendorAutoloadPath = realpath(PROJECT_ROOT . '/vendor/autoload.php');
+$mftfTestCasePath = realpath(PROJECT_ROOT . '/dev/tests/util/MftfTestCase.php');
+
+require_once $vendorAutoloadPath;
+require_once $mftfTestCasePath;
 
 // Set up AspectMock
 $kernel = \AspectMock\Kernel::getInstance();
 $kernel->init([
     'debug' => true,
-    'includePaths' => [PROJECT_ROOT . '/src'],
+    'includePaths' => [PROJECT_ROOT . DIRECTORY_SEPARATOR . 'src'],
     'cacheDir' => PROJECT_ROOT .
         DIRECTORY_SEPARATOR .
         'dev' .