github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

WIP: Include test files in imports/ directories

Browse Source
This commit is contained in:
Avital Oliver
2016-02-16 12:15:56 -08:00
parent 3ffccb9512
commit 9ec968ec65
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/isobuild/compiler-plugin.js
View File

@@ -384,10 +384,30 @@ class ResourceSlot {
// contained by a node_modules directory will already have been
// marked lazy in PackageSource#_inferFileOptions. Same for
// non-test files if running unit tests (`meteor test-app --unit`)
return this.packageSourceBatch.useMeteorInstall &&
if (!this.packageSourceBatch.useMeteorInstall) {
return false;
}
const dirs =
files.pathDirname(this.inputResource.path)
.split(files.pathSep)
.indexOf("imports") >= 0;
.split(files.pathSep);
const isInImports = dirs.indexOf("imports") >= 0;
if (global.testCommandMetadata &&
(global.testCommandMetadata.isUnitTest ||
global.testCommandMetadata.isIntegrationTest)) {
const isTestFile = _.any(dirs, (dir) =>
/\.tests?\./.test(dir) ||
/^tests?\./.test(dir) ||
/^tests$/.test(dir));
// test files should always be included, if we're running app
// tests.
return isInImports && !isTestFile;
} else {
return isInImports;
}
}
addStylesheet(options) {

2
tools/isobuild/package-source.js
View File

@@ -1344,7 +1344,7 @@ _.extend(PackageSource.prototype, {
// If running in unit test mode (`meteor test-app --unit`), all
// files other than test files should be loaded lazily
if (global.testCommandMetadata && testCommandMetadata.isUnitTest) {
if (global.testCommandMetadata && global.testCommandMetadata.isUnitTest) {
const isTestFile = _.any(dirs, (dir) =>
/\.tests?\./.test(dir) ||
/^tests?\./.test(dir) ||