fix(browser): stop using all global vars in 'browser-entry' (#4746)

Author: PaperStrike

browser-entry.js

@@ -213,7 +213,4 @@ Mocha.process = process;
 global.Mocha = Mocha;
 global.mocha = mocha;
 
-// this allows test/acceptance/required-tokens.js to pass; thus,
-// you can now do `const describe = require('mocha').describe` in a
-// browser context (assuming browserification).  should fix #880
-module.exports = Object.assign(mocha, global);
+module.exports = mocha;

lib/cli/watch-run.js

@@ -46,7 +46,7 @@ exports.watchParallelRun = (
 
       // this `require` is needed because the require cache has been cleared.  the dynamic
       // exports set via the below call to `mocha.ui()` won't work properly if a
-      // test depends on this module (see `required-tokens.spec.js`).
+      // test depends on this module.
       const Mocha = require('../mocha');
 
       // ... and now that we've gotten a new module, we need to use it again due
@@ -108,7 +108,7 @@ exports.watchRun = (mocha, {watchFiles, watchIgnore}, fileCollectParams) => {
 
       // this `require` is needed because the require cache has been cleared.  the dynamic
       // exports set via the below call to `mocha.ui()` won't work properly if a
-      // test depends on this module (see `required-tokens.spec.js`).
+      // test depends on this module.
       const Mocha = require('../mocha');
 
       // ... and now that we've gotten a new module, we need to use it again due

test/browser-specific/setup.js

@@ -8,3 +8,5 @@ global.expect = require('unexpected')
   .use(require('unexpected-map'))
   .use(require('unexpected-sinon'))
   .use(require('unexpected-eventemitter'));
+
+require('../../browser-entry');