☕️ Classic, reliable, trusted test framework for Node.js and the browser
Allow test selections to be inverted
Matt Robenoltc8309d1e01e7
diff --git a/Makefile b/Makefileindex b31b9a79..b8440567 100644--- a/Makefile+++ b/Makefile@@ -78,6 +78,13 @@ test-grep:--grep fast \test/acceptance/misc/grep+test-invert:+ @./bin/mocha \+ --reporter $(REPORTER) \+ --grep slow \+ --invert \+ test/acceptance/misc/grep+test-bail:@./bin/mocha \--reporter $(REPORTER) \diff --git a/bin/_mocha b/bin/_mochaindex 54578860..e22cf722 100755--- a/bin/_mocha+++ b/bin/_mocha@@ -61,6 +61,7 @@ program.option('-R, --reporter <name>', 'specify the reporter to use', 'dot').option('-u, --ui <name>', 'specify user-interface (bdd|tdd|exports)', 'bdd').option('-g, --grep <pattern>', 'only run tests matching <pattern>')+ .option('-i, --invert', 'inverts test selection').option('-t, --timeout <ms>', 'set test-case timeout in milliseconds [2000]').option('-s, --slow <ms>', '"slow" test threshold in milliseconds [75]', parseInt).option('-w, --watch', 'watch files for changes')@@ -310,7 +311,7 @@ function run(suite, fn) {var runner = new Runner(suite);runner.globals(globals);if (program.ignoreLeaks) runner.ignoreLeaks = true;- if (program.grep) runner.grep(new RegExp(program.grep));+ if (program.grep) runner.grep(new RegExp(program.grep), program.invert);var reporter = new Reporter(runner);if (program.growl) growl(runner, reporter);runner.run(fn);diff --git a/lib/runner.js b/lib/runner.jsindex 115cd067..2d90910a 100644--- a/lib/runner.js+++ b/lib/runner.js@@ -59,13 +59,15 @@ Runner.prototype.__proto__ = EventEmitter.prototype;* with number of tests matched.** @param {RegExp} re+ * @param {Boolean} invert* @return {Runner} for chaining* @api public*/-Runner.prototype.grep = function(re){+Runner.prototype.grep = function(re, invert){debug('grep %s', re);this._grep = re;+ this._invert = invert;this.total = this.grepTotal(this.suite);return this;};@@ -84,7 +86,9 @@ Runner.prototype.grepTotal = function(suite) {var total = 0;suite.eachTest(function(test){- if (self._grep.test(test.fullTitle())) total++;+ var match = self._grep.test(test.fullTitle());+ if (self._invert) match = !match;+ if (match) total++;});return total;@@ -324,7 +328,9 @@ Runner.prototype.runTests = function(suite, fn){if (!test) return fn();// grep- if (!self._grep.test(test.fullTitle())) return next();+ var match = self._grep.test(test.fullTitle());+ if (self._invert) match = !match;+ if (!match) return next();// pendingif (test.pending) {diff --git a/test/grep.js b/test/grep.jsindex 47b879dc..b4be3715 100644--- a/test/grep.js+++ b/test/grep.js@@ -32,4 +32,11 @@ describe('Mocha', function(){mocha.grep().should.equal(mocha);})})++ describe('"invert" option', function(){+ it('should add a Boolean to the mocha.options object', function(){+ var mocha = new Mocha({ invert: true });+ mocha.options.invert.should.be.ok;+ })+ })})diff --git a/test/runner.js b/test/runner.jsindex 0a219353..77a428c3 100644--- a/test/runner.js+++ b/test/runner.js@@ -21,6 +21,15 @@ describe('Runner', function(){newRunner.grep(/lions/);newRunner.total.should.equal(2);})++ it('should update the runner.total with number of matched tests when inverted', function(){+ suite.addTest(new Test('im a test about lions'));+ suite.addTest(new Test('im another test about lions'));+ suite.addTest(new Test('im a test about bears'));+ var newRunner = new Runner(suite);+ newRunner.grep(/lions/, true);+ newRunner.total.should.equal(1);+ })})describe('.grepTotal()', function(){@@ -31,6 +40,14 @@ describe('Runner', function(){runner.grep(/lions/);runner.grepTotal(suite).should.equal(2);})++ it('should return the total number of matched tests when inverted', function(){+ suite.addTest(new Test('im a test about lions'));+ suite.addTest(new Test('im another test about lions'));+ suite.addTest(new Test('im a test about bears'));+ runner.grep(/lions/, true);+ runner.grepTotal(suite).should.equal(1);+ })})describe('.globals()', function(){