Merge branch 'develop' into MQE-231

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

@@ -34,6 +34,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' .

composer.json

@@ -5,22 +5,9 @@
  */
 
 define('PROJECT_ROOT', dirname(dirname(dirname(__DIR__))));
-require_once PROJECT_ROOT . '/vendor/autoload.php';
-$RELATIVE_FW_PATH = PROJECT_ROOT;
+require_once realpath(PROJECT_ROOT . '/vendor/autoload.php');
 
 //Load constants from .env file
-if (file_exists(PROJECT_ROOT . '/.env')) {
-    $env = new \Dotenv\Loader(PROJECT_ROOT . '/.env');
-    $env->load();
-
-    if (array_key_exists('TESTS_MODULE_PATH', $_ENV) xor array_key_exists('TESTS_BP', $_ENV)) {
-        throw new Exception('You must define both parameters TESTS_BP and TESTS_MODULE_PATH or neither parameter');
-    }
-
-    foreach ($_ENV as $key => $var) {
-        defined($key) || define($key, $var);
-    }
-}
 defined('FW_BP') || define('FW_BP', PROJECT_ROOT);
 
 // add the debug flag here
@@ -29,7 +16,17 @@
     xdebug_disable();
 }
 
-$RELATIVE_TESTS_MODULE_PATH = '/MFTF/FunctionalTest';
+$RELATIVE_TESTS_MODULE_PATH = '/tests/functional/tests/MFTF';
 
-defined('TESTS_BP') || define('TESTS_BP', __DIR__);
-defined('TESTS_MODULE_PATH') || define('TESTS_MODULE_PATH', TESTS_BP . $RELATIVE_TESTS_MODULE_PATH);
+defined('MAGENTO_BP') || define('MAGENTO_BP', PROJECT_ROOT);
+defined('TESTS_BP') || define('TESTS_BP', dirname(dirname(__DIR__)));
+defined('TESTS_MODULE_PATH') || define('TESTS_MODULE_PATH', realpath(TESTS_BP . $RELATIVE_TESTS_MODULE_PATH));
+
+if (file_exists(TESTS_BP . DIRECTORY_SEPARATOR . '.env')) {
+    $env = new \Dotenv\Loader(TESTS_BP . DIRECTORY_SEPARATOR . '.env');
+    $env->load();
+
+    foreach ($_ENV as $key => $var) {
+        defined($key) || define($key, $var);
+    }
+}

dev/tests/_bootstrap.php

@@ -23,6 +23,17 @@
 class SuiteGeneratorTest extends MagentoTestCase
 {
 
+    /**
+     * Setup entry append and clear for Suite Generator
+     */
+    public static function setUpBeforeClass()
+    {
+        AspectMock::double(SuiteGenerator::class, [
+            'clearPreviousSessionConfigEntries' => null,
+            'appendEntriesToConfig' => null
+        ]);
+    }
+
     /**
      * Tests generating a single suite given a set of parsed test data
      * @throws \Exception
@@ -169,6 +180,5 @@ private function setMockTestAndSuiteParserOutput($testData, $suiteData)
         $property = new \ReflectionProperty(SuiteGenerator::class, 'groupClassGenerator');
         $property->setAccessible(true);
         $property->setValue($instance, $instance);
-
     }
 }

dev/tests/functional/MFTF/_bootstrap.php

@@ -66,12 +66,12 @@ public function testGetTestObject()
         $expectedBeforeHookObject = new TestHookObject(
             TestObjectExtractor::TEST_BEFORE_HOOK,
             $testDataArrayBuilder->testName,
-            [$expectedBeforeActionObject]
+            ["testActionBefore" => $expectedBeforeActionObject]
         );
         $expectedAfterHookObject = new TestHookObject(
             TestObjectExtractor::TEST_AFTER_HOOK,
             $testDataArrayBuilder->testName,
-            [$expectedAfterActionObject]
+            ["testActionAfter" => $expectedAfterActionObject]
         );
         $expectedFailedHookObject = new TestHookObject(
             TestObjectExtractor::TEST_FAILED_HOOK,
@@ -86,7 +86,7 @@ public function testGetTestObject()
         );
         $expectedTestObject = new TestObject(
             $testDataArrayBuilder->testName,
-            [$expectedTestActionObject],
+            ["testActionInTest" => $expectedTestActionObject],
             [
                 'features' => ['NO MODULE DETECTED'],
                 'group' => ['test']