Skip to content

Commit dda214e

Browse files
committed
MQE-1288: ModuleResolver test paths are too greedy
- Specify to onnly look under app and vendor for magento bp - Removed Project root from list of search areas
1 parent 1d022b9 commit dda214e

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,17 @@ public function testGetModulePathsLocations()
101101
// Define the Module paths from default TESTS_MODULE_PATH
102102
$modulePath = defined('TESTS_MODULE_PATH') ? TESTS_MODULE_PATH : TESTS_BP;
103103

104-
// Define the Module paths from vendor modules
105-
$projectRootCodePath = PROJECT_ROOT;
106-
107104
$mockResolver->verifyInvoked('globRelevantPaths', [$modulePath, '']);
108105
$mockResolver->verifyInvoked(
109106
'globRelevantPaths',
110-
[$magentoBaseCodePath, 'Test' . DIRECTORY_SEPARATOR .'Mftf']
107+
[$magentoBaseCodePath . DIRECTORY_SEPARATOR . "vendor" , 'Test' . DIRECTORY_SEPARATOR .'Mftf']
111108
);
112109
$mockResolver->verifyInvoked(
113110
'globRelevantPaths',
114-
[$projectRootCodePath, 'Test' . DIRECTORY_SEPARATOR .'Mftf']
111+
[
112+
$magentoBaseCodePath . DIRECTORY_SEPARATOR . "app" . DIRECTORY_SEPARATOR . "code",
113+
'Test' . DIRECTORY_SEPARATOR .'Mftf'
114+
]
115115
);
116116
}
117117

src/Magento/FunctionalTestingFramework/Util/ModuleResolver.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,14 @@ private function aggregateTestModulePaths()
240240
$modulePath = defined('TESTS_MODULE_PATH') ? TESTS_MODULE_PATH : TESTS_BP;
241241
$modulePath = rtrim($modulePath, DIRECTORY_SEPARATOR);
242242

243-
// Define the Module paths from project root
244-
$projectRootCodePath = PROJECT_ROOT;
243+
$vendorCodePath = DIRECTORY_SEPARATOR . "vendor";
244+
$appCodePath = DIRECTORY_SEPARATOR . "app" . DIRECTORY_SEPARATOR . "code";
245245

246246
$codePathsToPattern = [
247247
$modulePath => '',
248-
$magentoBaseCodePath => 'Test' . DIRECTORY_SEPARATOR . 'Mftf',
249-
$projectRootCodePath => 'Test' . DIRECTORY_SEPARATOR . 'Mftf'
248+
$magentoBaseCodePath . $vendorCodePath => 'Test' . DIRECTORY_SEPARATOR . 'Mftf',
249+
$magentoBaseCodePath . $appCodePath => 'Test' . DIRECTORY_SEPARATOR . 'Mftf',
250+
250251
];
251252

252253
foreach ($codePathsToPattern as $codePath => $pattern) {

0 commit comments

Comments
 (0)