Runner: use more efficient method to build list of tests

jamestalmage · Jan 21, 2016 · 4e23943 · 4e23943
1 parent ea551c7
commit 4e23943
Showing 1 changed file with 17 additions and 22 deletions.
diff --git a/lib/runner.js b/lib/runner.js
@@ -50,6 +50,7 @@ function Runner(opts) {
 	this.results = [];
 	this.tests = [];
 	this.testsByType = {};
+	this.hasExclusive = false;
 }
 
 util.inherits(Runner, EventEmitter);
@@ -67,6 +68,9 @@ Runner.prototype._addTest = function (test) {
 	var type = test.metadata.type;
 	var tests = this.testsByType[type] || (this.testsByType[type] = []);
 	tests.push(test);
+	if (test.metadata.exclusive) {
+		this.hasExclusive = true;
+	}
 };
 
 Runner.prototype._runTestWithHooks = function (test) {
@@ -144,33 +148,24 @@ Runner.prototype._addTestResult = function (test) {
 Runner.prototype.run = function () {
 	var self = this;
 
-	var hasExclusive = this.select({
-		exclusive: true,
-		skipped: false,
-		type: 'test'
-	}).length > 0;
-
-	var serial = this.select({
-		exclusive: hasExclusive,
-		serial: true,
-		type: 'test'
-	});
-
-	var concurrent = this.select({
-		exclusive: hasExclusive,
-		serial: false,
-		type: 'test'
-	});
+	var serial = [];
+	var concurrent = [];
+	var skipCount = 0;
 
-	var skipped = this.select({
-		type: 'test',
-		skipped: true
-	});
+	this.testsByType.test.forEach(function (test) {
+		var metadata = test.metadata;
+		if (metadata.exclusive === this.hasExclusive) {
+			(metadata.serial ? serial : concurrent).push(test);
+			if (metadata.skipped) {
+				skipCount++;
+			}
+		}
+	}, this);
 
 	var stats = this.stats = {
 		failCount: 0,
 		passCount: 0,
-		testCount: serial.length + concurrent.length - skipped.length
+		testCount: serial.length + concurrent.length - skipCount
 	};
 
 	return eachSeries(this.select({type: 'before'}), this._runTest, this)