From 43bb94cccce6891c7a2d988491d0af036724039f Mon Sep 17 00:00:00 2001 From: Avital Oliver Date: Fri, 5 Feb 2016 11:43:15 -0800 Subject: [PATCH] Don't ignore tests/ when running `meteor test-app`. --- packages/meteor-mocha/run-tests.js | 7 +++---- tools/isobuild/package-source.js | 5 ++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/meteor-mocha/run-tests.js b/packages/meteor-mocha/run-tests.js index edf24e485e..51568c65b0 100644 --- a/packages/meteor-mocha/run-tests.js +++ b/packages/meteor-mocha/run-tests.js @@ -2,12 +2,11 @@ runTests = function() { // hide any existing HTML but don't remove it $('body > *').css({display: 'none'}); document.head.title = "Tests"; - - MochaRunner.setReporter(practical.mocha.HtmlReporter) + MochaRunner.setReporter(practical.mocha.HtmlReporter); inRange = false; - var rules = _.filter(document.styleSheets[0].cssRules, (r) => { + var rules = _.filter(document.styleSheets[0].cssRules, (r) => { if (r.selectorText && r.selectorText.match(/scoped/)) { inRange = !inRange; }; @@ -18,6 +17,6 @@ runTests = function() { $('head link[rel=stylesheet]').remove(); $('head').append(''); -} +}; Meteor.isTest = true; diff --git a/tools/isobuild/package-source.js b/tools/isobuild/package-source.js index d56e366c27..5a90c3e9c6 100644 --- a/tools/isobuild/package-source.js +++ b/tools/isobuild/package-source.js @@ -1388,12 +1388,15 @@ _.extend(PackageSource.prototype, { ); const anyLevelExcludes = [ - /^tests\/$/, /^node_modules\/$/, arch === "os" ? /^client\/$/ : /^server\/$/, ...sourceReadOptions.exclude, ]; + if (!global.testCommandMetadata) { + anyLevelExcludes.push(/^tests\/$/); + } + const topLevelExcludes = isApp ? [ ...anyLevelExcludes, /^packages\/$/,