fixed support for multiple --globals lists

dannycoates · Apr 13, 2012 · 792c34a · 792c34a
1 parent cc466dd
commit 792c34a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/bin/_mocha b/bin/_mocha
@@ -26,6 +26,12 @@ var program = require('commander')
 
 var files = [];
 
+/**
+ * Globals.
+ */
+
+var globals = [];
+
 /**
  * Images.
  */
@@ -63,10 +69,8 @@ program.name = 'mocha';
 
 // --globals
 
-var globals = [];
-program.on('globals', function(){
-  globals = globals.concat(program.globals);
-  program.globals = globals;
+program.on('globals', function(val){
+  globals = globals.concat(list(val));
 });
 
 // --reporters
@@ -277,7 +281,7 @@ function load(files, fn) {
 function run(suite, fn) {
   suite.emit('run');
   var runner = new Runner(suite);
-  runner.globals(program.globals);
+  runner.globals(globals);
   if (program.ignoreLeaks) runner.ignoreLeaks = true;
   if (program.grep) runner.grep(new RegExp(program.grep));
   var reporter = new Reporter(runner);

diff --git a/test/acceptance/globals.js b/test/acceptance/globals.js
@@ -21,6 +21,7 @@ describe('global leaks', function(){
   it('should pass when accepted', function(){
     okGlobalA = 1;
     okGlobalB = 1;
+    okGlobalC = 1;
   })
 
   afterEach(function(){

diff --git a/test/jsapi/index.js b/test/jsapi/index.js
@@ -4,7 +4,7 @@ var Mocha = require('../../')
 
 var mocha = new Mocha({
   ui: 'bdd',
-  globals: ['okGlobalA', 'okGlobalB'],
+  globals: ['okGlobalA', 'okGlobalB', 'okGlobalC'],
   // ignoreLeaks: true,
   growl: true
 });

diff --git a/test/mocha.opts b/test/mocha.opts
@@ -2,6 +2,6 @@
 --reporter dot
 --ui bdd
 --growl
---globals okGlobalA
---globals okGlobalB
+--globals okGlobalA,okGlobalB
+--globals okGlobalC
 --timeout 200