tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUG Prevent live manifest loading files from nested test directories

Browse Source 
E.g. framework/admin/tests
This commit is contained in:
Damian Mooyman 2016-03-31 15:58:23 +13:00
parent 78892f0a8d
commit e8a68c42ce
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/manifest/ManifestFileFinder.php
View File

@ -37,9 +37,8 @@ class ManifestFileFinder extends SS_FileFinder {
return false; return false;
} }
// If we're not in testing mode, then skip over the tests directory in // If we're not in testing mode, then skip over any tests directories.
// the module root. if ($this->getOption('ignore_tests') && $basename == self::TESTS_DIR) {
if ($this->getOption('ignore_tests') && $depth == 2 && $basename == self::TESTS_DIR) {
return false; return false;
} }

3
tests/core/manifest/ManifestFileFinderTest.php
View File

@ -43,7 +43,8 @@ class ManifestFileFinderTest extends SapphireTest {
$this->assertFinderFinds($finder, array( $this->assertFinderFinds($finder, array(
'module/module.txt', 'module/module.txt',
'module/tests/tests.txt' 'module/tests/tests.txt',
'module/code/tests/tests2.txt'
)); ));
} }

0
tests/core/manifest/fixtures/manifestfilefinder/module/code/tests/tests2.txt Normal file
View File