Merge pull request #244 from magento/MQE-1288

MQE-1288: ModuleResolver test paths are too greedy

Author: KevinBKozan

dev/tests/unit/Magento/FunctionalTestFramework/Util/ModuleResolverTest.php

@@ -101,17 +101,17 @@ public function testGetModulePathsLocations()
         // Define the Module paths from default TESTS_MODULE_PATH
         $modulePath = defined('TESTS_MODULE_PATH') ? TESTS_MODULE_PATH : TESTS_BP;
 
-        // Define the Module paths from vendor modules
-        $projectRootCodePath = PROJECT_ROOT;
-
         $mockResolver->verifyInvoked('globRelevantPaths', [$modulePath, '']);
         $mockResolver->verifyInvoked(
             'globRelevantPaths',
-            [$magentoBaseCodePath, 'Test' . DIRECTORY_SEPARATOR .'Mftf']
+            [$magentoBaseCodePath . DIRECTORY_SEPARATOR . "vendor" , 'Test' . DIRECTORY_SEPARATOR .'Mftf']
         );
         $mockResolver->verifyInvoked(
             'globRelevantPaths',
-            [$projectRootCodePath, 'Test' . DIRECTORY_SEPARATOR .'Mftf']
+            [
+                $magentoBaseCodePath . DIRECTORY_SEPARATOR . "app" . DIRECTORY_SEPARATOR . "code",
+                'Test' . DIRECTORY_SEPARATOR .'Mftf'
+            ]
         );
     }
 

src/Magento/FunctionalTestingFramework/Test/Config/Dom.php

@@ -88,7 +88,8 @@ public function initDom($xml, $filename = null)
     {
         $dom = parent::initDom($xml, $filename);
 
-        if ($this->checkFilenameSuffix($filename, self::TEST_FILE_NAME_ENDING)) {
+        // Cannot rely on filename to ensure this file is a Test.xml
+        if ($dom->getElementsByTagName('tests')->length > 0) {
             $testsNode = $dom->getElementsByTagName('tests')[0];
             $testNodes = $dom->getElementsByTagName('test');
             $this->testsValidationUtil->validateChildUniqueness(

src/Magento/FunctionalTestingFramework/Util/ModuleResolver.php

@@ -240,13 +240,13 @@ private function aggregateTestModulePaths()
         $modulePath = defined('TESTS_MODULE_PATH') ? TESTS_MODULE_PATH : TESTS_BP;
         $modulePath = rtrim($modulePath, DIRECTORY_SEPARATOR);
 
-        // Define the Module paths from project root
-        $projectRootCodePath = PROJECT_ROOT;
+        $vendorCodePath = DIRECTORY_SEPARATOR . "vendor";
+        $appCodePath = DIRECTORY_SEPARATOR . "app" . DIRECTORY_SEPARATOR . "code";
 
         $codePathsToPattern = [
             $modulePath => '',
-            $magentoBaseCodePath => 'Test' . DIRECTORY_SEPARATOR . 'Mftf',
-            $projectRootCodePath => 'Test' . DIRECTORY_SEPARATOR . 'Mftf'
+            $magentoBaseCodePath . $vendorCodePath => 'Test' . DIRECTORY_SEPARATOR . 'Mftf',
+            $magentoBaseCodePath . $appCodePath => 'Test' . DIRECTORY_SEPARATOR . 'Mftf'
         ];
 
         foreach ($codePathsToPattern as $codePath => $pattern) {