wip - only-modifier

lib/runner.js

@@ -24,11 +24,6 @@ function Runner(opts) {
 
 	this.results = [];
 
-	this.stats = {
-		failCount: 0,
-		testCount: 0
-	};
-
 	this.tests = {
 		concurrent: [],
 		serial: [],
@@ -43,12 +38,10 @@ util.inherits(Runner, EventEmitter);
 module.exports = Runner;
 
 Runner.prototype.addTest = function (title, cb) {
-	this.stats.testCount++;
 	this.tests.concurrent.push(new Test(title, cb));
 };
 
 Runner.prototype.addSerialTest = function (title, cb) {
-	this.stats.testCount++;
 	this.tests.serial.push(new Test(title, cb));
 };
 
@@ -182,12 +175,35 @@ Runner.prototype._addTestResult = function (test) {
 	this.emit('test', props);
 };
 
+function isExclusive(test) {
+	return test.exclusive;
+}
+
+function isUnskipped(test) {
+	return !test.skip;
+}
+
 Runner.prototype.run = function () {
 	var self = this;
 	var tests = this.tests;
-	var stats = this.stats;
+	var serial = tests.serial;
+	var concurrent = tests.concurrent;
+	var hasExclusive = tests.concurrent.some(isExclusive) || tests.serial.some(isExclusive);
+	if (hasExclusive) {
+		serial = serial.filter(isExclusive);
+		concurrent = concurrent.filter(isExclusive);
+	} else {
+		serial = serial.filter(isUnskipped);
+		concurrent = concurrent.filter(isUnskipped);
+	}
+
+	var stats = this.stats = {
+		failCount: 0,
+		testCount: serial.length + concurrent.length
+	};
 
 	// Runner is executed directly in tests, in that case process.send() == undefined
+	// TODO (jamestalmage): We do not have a failCount yet. Why are we sending now?
 	if (process.send) {
 		process.send({
 			name: 'stats',
@@ -203,10 +219,10 @@ Runner.prototype.run = function () {
 			}
 		})
 		.then(function () {
-			return self.serial(tests.serial);
+			return self.serial(serial);
 		})
 		.then(function () {
-			return self.concurrent(tests.concurrent);
+			return self.concurrent(concurrent);
 		})
 		.then(function () {
 			return eachSeries(tests.after, self._runTest.bind(self));

test/runner.js

@@ -14,7 +14,7 @@ test('returns new instance of runner without "new"', function (t) {
 test('runner.addTest adds a new test', function (t) {
 	var runner = new Runner();
 	runner.addTest(mockTitle, noop);
-	t.equal(runner.stats.testCount, 1);
+	// t.equal(runner.stats.testCount, 1);
 	t.equal(runner.tests.concurrent.length, 1);
 	t.ok(runner.tests.concurrent[0] instanceof Test);
 	t.end();
@@ -23,7 +23,7 @@ test('runner.addTest adds a new test', function (t) {
 test('runner.addSerialTest adds a new serial test', function (t) {
 	var runner = new Runner();
 	runner.addSerialTest(mockTitle, noop);
-	t.equal(runner.stats.testCount, 1);
+	// t.equal(runner.stats.testCount, 1);
 	t.equal(runner.tests.serial.length, 1);
 	t.ok(runner.tests.serial[0] instanceof Test);
 	t.end();