MQE-1124: [Github Issue] Allow running tests for modules installed in Magento instance via vendor directory. #162

- Adjusted Module Resolver to look Recursively from Project Root, Magento BP and dev/tests
- Updated Module Resolver Unit Tests to reflect changes

Author: aljcalandra

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

@@ -62,8 +62,6 @@ public function testGetModulePathsAggregate()
         $this->setMockResolverProperties($resolver, null, [0 => "Magento_example"]);
         $this->assertEquals(
             [
-                "example" . DIRECTORY_SEPARATOR . "paths",
-                "example" . DIRECTORY_SEPARATOR . "paths",
                 "example" . DIRECTORY_SEPARATOR . "paths"
             ],
             $resolver->getModulesPath()
@@ -88,35 +86,28 @@ public function testGetModulePathsLocations()
         $this->setMockResolverProperties($resolver, null, null);
         $this->assertEquals(
             [
-                "example" . DIRECTORY_SEPARATOR . "paths",
-                "example" . DIRECTORY_SEPARATOR . "paths",
                 "example" . DIRECTORY_SEPARATOR . "paths"
             ],
             $resolver->getModulesPath()
         );
 
         // Define the Module paths from app/code
-        $appCodePath = MAGENTO_BP
-            . DIRECTORY_SEPARATOR
-            . 'app' . DIRECTORY_SEPARATOR
-            . 'code' . DIRECTORY_SEPARATOR;
+        $magentoBaseCodePath = MAGENTO_BP;
 
         // 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
-        $vendorCodePath = PROJECT_ROOT
-            . DIRECTORY_SEPARATOR
-            . 'vendor' . DIRECTORY_SEPARATOR;
+        $projectRootCodePath = PROJECT_ROOT;
 
         $mockResolver->verifyInvoked('globRelevantPaths', [$modulePath, '']);
         $mockResolver->verifyInvoked(
             'globRelevantPaths',
-            [$appCodePath, DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR .'Mftf']
+            [$magentoBaseCodePath, 'Test' . DIRECTORY_SEPARATOR .'Mftf']
         );
         $mockResolver->verifyInvoked(
             'globRelevantPaths',
-            [$vendorCodePath, DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR .'Mftf']
+            [$projectRootCodePath, 'Test' . DIRECTORY_SEPARATOR .'Mftf']
         );
     }
 
@@ -151,8 +142,6 @@ public function testGetModulePathsBlacklist()
             function ($arg1, $arg2) {
                 if ($arg2 === "") {
                     $mockValue = ["somePath" => "somePath"];
-                } elseif (strpos($arg1, "app")) {
-                    $mockValue = ["otherPath" => "otherPath"];
                 } else {
                     $mockValue = ["lastPath" => "lastPath"];
                 }
@@ -161,7 +150,7 @@ function ($arg1, $arg2) {
         );
         $resolver = ModuleResolver::getInstance();
         $this->setMockResolverProperties($resolver, null, null, ["somePath"]);
-        $this->assertEquals(["otherPath", "lastPath"], $resolver->getModulesPath());
+        $this->assertEquals(["lastPath"], $resolver->getModulesPath());
         TestLoggingUtil::getInstance()->validateMockLogStatement(
             'info',
             'excluding module',

src/Magento/FunctionalTestingFramework/Util/ModuleResolver.php

@@ -218,29 +218,24 @@ private function aggregateTestModulePaths()
     {
         $allModulePaths = [];
 
-        // Define the Module paths from app/code
-        $appCodePath = MAGENTO_BP
-            . DIRECTORY_SEPARATOR
-            . 'app' . DIRECTORY_SEPARATOR
-            . 'code' . DIRECTORY_SEPARATOR;
+        // Define the Module paths from magento bp
+        $magentoBaseCodePath = MAGENTO_BP;
 
         // Define the Module paths from default TESTS_MODULE_PATH
         $modulePath = defined('TESTS_MODULE_PATH') ? TESTS_MODULE_PATH : TESTS_BP;
         $modulePath = rtrim($modulePath, DIRECTORY_SEPARATOR);
 
-        // Define the Module paths from vendor modules
-        $vendorCodePath = PROJECT_ROOT
-            . DIRECTORY_SEPARATOR
-            . 'vendor' . DIRECTORY_SEPARATOR;
+        // Define the Module paths from project root
+        $projectRootCodePath = PROJECT_ROOT;
 
         $codePathsToPattern = [
             $modulePath => '',
-            $appCodePath => DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . 'Mftf',
-            $vendorCodePath => DIRECTORY_SEPARATOR . 'Test' . DIRECTORY_SEPARATOR . 'Mftf'
+            $magentoBaseCodePath => 'Test' . DIRECTORY_SEPARATOR . 'Mftf',
+            $projectRootCodePath => 'Test' . DIRECTORY_SEPARATOR . 'Mftf'
         ];
 
         foreach ($codePathsToPattern as $codePath => $pattern) {
-            $allModulePaths = array_merge_recursive($allModulePaths, $this->globRelevantPaths($codePath, $pattern));
+            $allModulePaths = array_merge($allModulePaths, $this->globRelevantPaths($codePath, $pattern));
         }
 
         return $allModulePaths;
@@ -288,7 +283,15 @@ private function globRelevantPaths($testPath, $pattern)
      */
     private static function globRelevantWrapper($testPath, $pattern)
     {
-        return glob($testPath . '*' . DIRECTORY_SEPARATOR . '*' . $pattern);
+        if ($pattern == "") {
+            return glob($testPath . '*' . DIRECTORY_SEPARATOR . '*' . $pattern);
+        }
+        $subDirectory = "*" . DIRECTORY_SEPARATOR;
+        $directories = glob($testPath . $subDirectory . $pattern, GLOB_ONLYDIR);
+        foreach (glob($testPath . $subDirectory, GLOB_ONLYDIR) as $dir) {
+            $directories = array_merge($directories, self::globRelevantWrapper($dir, $pattern));
+        }
+        return $directories;
     }
 
     /**