Merge pull request #1346 from kevinconway/fix_1354

Resolve #1345

Author: Joshua Appelman

lib/browser/glob.js

@@ -614,6 +614,10 @@ require.register("browser/fs.js", function(module, exports, require){
 
 }); // module: browser/fs.js
 
+require.register("browser/glob.js", function(module, exports, require){
+
+}); // module: browser/glob.js
+
 require.register("browser/path.js", function(module, exports, require){
 
 }); // module: browser/path.js
@@ -5521,7 +5525,7 @@ var fs = require('browser/fs')
   , path = require('browser/path')
   , basename = path.basename
   , exists = fs.existsSync || path.existsSync
-  , glob = require('glob')
+  , glob = require('browser/glob')
   , join = path.join
   , debug = require('browser/debug')('mocha:watch');
 

mocha.js

@@ -49,6 +49,7 @@ function parseRequires(js) {
     .replace(/require\('diff'\)/g                 , "require('browser/diff')")
     .replace(/require\('tty'\)/g                  , "require('browser/tty')")
     .replace(/require\('escape-string-regexp'\)/g , "require('browser/escape-string-regexp')")
+    .replace(/require\('glob'\)/g                 , "require('browser/glob')")
     .replace(/require\('fs'\)/g                   , "require('browser/fs')");
 }