MQE-987: Decouple MFTF from Magento

imeron2433 · imeron2433 · commit 9309e9ffadfa · 2018-05-24T11:35:19.000-05:00
- fix pathing issue following windows compat
diff --git a/dev/tests/functional/_bootstrap.php b/dev/tests/functional/_bootstrap.php
@@ -16,7 +16,7 @@
     xdebug_disable();
 }
 
-$RELATIVE_TESTS_MODULE_PATH = '/tests/functional/tests/';
+$RELATIVE_TESTS_MODULE_PATH = '/tests/functional/tests/MFTF';
 
 defined('MAGENTO_BP') || define('MAGENTO_BP', PROJECT_ROOT);
 defined('TESTS_BP') || define('TESTS_BP', dirname(dirname(__DIR__)));
diff --git a/src/Magento/FunctionalTestingFramework/Util/ModuleResolver.php b/src/Magento/FunctionalTestingFramework/Util/ModuleResolver.php
@@ -229,7 +229,7 @@ private function aggregateTestModulePaths()
 
         // Define the Module paths from default TESTS_MODULE_PATH
         $modulePath = defined('TESTS_MODULE_PATH') ? TESTS_MODULE_PATH : TESTS_BP;
-        $modulePath = rtrim($modulePath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $modulePath = rtrim($modulePath, DIRECTORY_SEPARATOR);
 
         // Define the Module paths from vendor modules
         $vendorCodePath = PROJECT_ROOT

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`xdebug_disable();`
`17`	`17`	`}`
`18`	`18`
`19`		`-$RELATIVE_TESTS_MODULE_PATH = '/tests/functional/tests/';`
	`19`	`+$RELATIVE_TESTS_MODULE_PATH = '/tests/functional/tests/MFTF';`
`20`	`20`
`21`	`21`	`defined('MAGENTO_BP') \|\| define('MAGENTO_BP', PROJECT_ROOT);`
`22`	`22`	`defined('TESTS_BP') \|\| define('TESTS_BP', dirname(dirname(__DIR__)));`