MQE-189: Fixed ModuleResolver to recover a previous bad merge.

Author: jilu1

src/Magento/AcceptanceTestFramework/Config/FileResolver/Mask.php

@@ -62,7 +62,7 @@ protected function getFileCollection($filename, $scope)
         $modulesPath = $this->moduleResolver->getModulesPath();
 
         foreach ($modulesPath as $modulePath) {
-            $path = $modulePath;
+            $path = $modulePath . '/' . $scope . '/';
             if (is_readable($path)) {
                 $directoryIterator = new \RecursiveIteratorIterator(
                     new \RecursiveDirectoryIterator(

src/Magento/AcceptanceTestFramework/Util/ModuleResolver.php

@@ -159,8 +159,8 @@ public function getModulesPath()
         }
 
         $enabledModules = $this->getEnabledModules();
-        $modulePath = FW_BP . '/src/Magento/AcceptanceTestFramework';
-        $allModulePaths = glob($modulePath . '/*');
+        $modulePath = defined('TESTS_MODULE_PATH') ? TESTS_MODULE_PATH : TESTS_BP;
+        $allModulePaths = glob($modulePath . '*/*');
         if (empty($enabledModules)) {
             $this->enabledModulePaths = $allModulePaths;
             return $this->enabledModulePaths;