cleaned up the api, added .parallel() accessor to Suite

bin/_mocha

@@ -240,7 +240,7 @@ if (program.asyncOnly) mocha.asyncOnly();
 
 // --parallel
 
-if (program.parallel) mocha.parallel(true);
+if (program.parallel) mocha.parallel();
 
 // --globals
 

lib/mocha.js

@@ -294,7 +294,7 @@ Mocha.prototype.asyncOnly = function(){
 };
 
 /**
- * Makes root-suites run in parallel
+ * Makes root-level suites run in parallel
  *
  * @return {Mocha}
  * @api public
@@ -321,7 +321,7 @@ Mocha.prototype.run = function(fn){
   var reporter = new this._reporter(runner);
   runner.ignoreLeaks = false !== options.ignoreLeaks;
   runner.asyncOnly = options.asyncOnly;
-  runner.suite._parallel = options.parallel;
+  runner.suite.parallel(options.parallel);
   if (options.grep) runner.grep(options.grep, options.invert);
   if (options.globals) runner.globals(options.globals);
   if (options.growl) this._growl(runner, reporter);

lib/runner.js

@@ -241,7 +241,7 @@ Runner.prototype.hook = function(name, fn){
     , self = this
     , timer;
 
-  // if we're bailing, only run hooks if this.suite cause it, otherwise, skip
+  // if we're bailing, only run hooks if this suite caused it, otherwise, skip
   if (suite.failures && suite.bail() && !suite.failSource) return fn();
 
   function next(i) {
@@ -448,21 +448,19 @@ Runner.prototype.runSuite = function(suite, fn){
 
   function done() {
     debug('suite done %s', suite.fullTitle());
-    //self.suite = runner.suite;
+
     self.hook('afterAll', function(){
       debug('suite end %s', suite.fullTitle());
-      if (self.suite._parallel) {
-        runners.forEach(function (runner) {
-          self._rebroadcastAll(runner);
-        })
+      if (suite.parallel()) {
+        self._rebroadcastAll(runners);
       }
       self.emit('suite end', suite);
       fn();
     });
   }
 
   function next() {
-    if (suite._parallel) {
+    if (suite.parallel()) {
       utils.eachParallel(suite.suites, suiteItr, done);
     } else {
       utils.eachSeries(suite.suites, suiteItr, done);
@@ -501,7 +499,7 @@ Runner.prototype._wrapEvents = function(runner) {
   runner.eventCache = [];
   _events.forEach(function (event) {
     runner.on(event, function (data, err) {
-      if (self.suite._parallel) {
+      if (self.suite.parallel()) {
         runner.eventCache.push({event: event, data: data, err: err});
       } else {
         self.emit(event, data, err);
@@ -511,15 +509,17 @@ Runner.prototype._wrapEvents = function(runner) {
 };
 
 /**
- * Replay the cached events from a child runner as if this runner emitted them
- * @param  {Runner} runner
+ * Replay the cached events from child runners as if this runner emitted them
+ * @param  {Array[Runner]} runners
  * @api private
  */
-Runner.prototype._rebroadcastAll = function (runner) {
+Runner.prototype._rebroadcastAll = function (runners) {
   var self = this;
-  runner.eventCache.forEach(function (cache) {
-    self.emit(cache.event, cache.data, cache.err);
-  });
+  runners.forEach(function (runner) {
+    runner.eventCache.forEach(function (cache) {
+      self.emit(cache.event, cache.data, cache.err);
+    });
+  })
 };
 
 /**

lib/suite.js

@@ -133,6 +133,21 @@ Suite.prototype.bail = function(bail){
   return this;
 };
 
+/**
+ * Sets whether to run child suites in parallel
+ *
+ * @param {Boolean} parallel
+ * @return {Suite|Number} for chaining
+ * @api private
+ */
+
+Suite.prototype.parallel = function(parallel){
+  if (0 == arguments.length) return this._parallel;
+  debug('parallel %s', parallel);
+  this._parallel = parallel;
+  return this;
+};
+
 /**
  * Mark this suite as having failures, as well as  any child suites.
  * This is bookkeeping for fine-grained bailing.

test/acceptance/misc/parallelFail.js

@@ -1,6 +1,6 @@
 describe('parallel failing', function () {
 
-  this._parallel = true;
+  this.parallel(true);
   var runs = 0;
 
   after(function (done) {

test/acceptance/parallel.js

@@ -1,7 +1,7 @@
 describe('parallel suite', function () {
   var start;
 
-  this._parallel = true;
+  this.parallel(true);
 
   before(function (done) {
     start = new Date();