support explicit includes for cover + tests

gotwarlost · Dec 10, 2014 · 5b99059 · 5b99059
1 parent 5a951b7
commit 5b99059
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/lib/command/common/run-with-cover.js b/lib/command/common/run-with-cover.js
@@ -26,6 +26,7 @@ function usage(arg0, command) {
             formatOption('--config <path-to-config>', 'the configuration file to use, defaults to .istanbul.yml'),
             formatOption('--root <path> ', 'the root path to look for files to instrument, defaults to .'),
             formatOption('-x <exclude-pattern> [-x <exclude-pattern>]', 'one or more fileset patterns e.g. "**/vendor/**"'),
+            formatOption('-i <include-pattern> [-x <include-pattern>]', 'one or more fileset patterns e.g. "**/*.js"'),
             formatOption('--[no-]default-excludes', 'apply default excludes [ **/node_modules/**, **/test/**, **/tests/** ], defaults to true'),
             formatOption('--hook-run-in-context', 'hook vm.runInThisContext in addition to require (supports RequireJS), defaults to false'),
             formatOption('--post-require-hook <file> | <module>', 'JS module that exports a function for post-require processing'),
@@ -56,7 +57,8 @@ function run(args, commandName, enableHooks, callback) {
             'post-require-hook': String,
             'preserve-comments': Boolean,
             'include-all-sources': Boolean,
-            'preload-sources': Boolean
+            'preload-sources': Boolean,
+            i: [ Array, String ]
         },
         opts = nopt(template, { v : '--verbose' }, args, 0),
         overrides = {
@@ -140,7 +142,7 @@ function run(args, commandName, enableHooks, callback) {
         excludes.push(path.relative(process.cwd(), path.join(reportingDir, '**', '*')));
         matcherFor({
             root: config.instrumentation.root() || process.cwd(),
-            includes: [ '**/*.js' ],
+            includes: opts.i || [ '**/*.js' ],
             excludes: excludes
         },
             function (err, matchFn) {

diff --git a/test/cli/test-cover-command.js b/test/cli/test-cover-command.js
@@ -117,6 +117,23 @@ module.exports = {
             test.done();
         });
     },
+    "should cover tests as expected without extra noise and using includes": function (test) {
+        helper.setOpts({ lazyHook : true });
+        run([ 'test/run.js', '-i', '**/foo.js' ], function (results) {
+            test.ok(results.succeeded());
+            test.ok(!results.grepError(/Module load hook:/));
+            test.ok(existsSync(path.resolve(OUTPUT_DIR, 'lcov.info')));
+            test.ok(existsSync(path.resolve(OUTPUT_DIR, 'lcov-report')));
+            test.ok(existsSync(path.resolve(OUTPUT_DIR, 'coverage.json')));
+            var coverage = JSON.parse(fs.readFileSync(path.resolve(OUTPUT_DIR, 'coverage.json'), 'utf8')),
+                filtered;
+            filtered = Object.keys(coverage).filter(function (k) { return k.match(/foo/); });
+            test.ok(filtered.length !== 0);
+            filtered = Object.keys(coverage).filter(function (k) { return k.match(/bar/); });
+            test.ok(filtered.length === 0);
+            test.done();
+        });
+    },
     "should skip reporting when requested": function (test) {
         helper.setOpts({ lazyHook : true });
         run([ 'test/run.js', '--report', 'none', '--print', 'detail' ], function (results) {