Merge 2cf235b into 02bdb6b

mochajs · Jul 17, 2020 · 86fd8c7 · 86fd8c7
2 parents 02bdb6b + 2cf235b
commit 86fd8c7
Show file tree

Hide file tree

Showing 16 changed files with 546 additions and 335 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -15,11 +15,6 @@ rules:
   strict:
     - error
     - safe
-  # disallow Object.assign
-  no-restricted-properties:
-    - error
-    - object: 'Object'
-      property: 'assign'
 overrides:
   - files:
       - 'docs/js/**/*.js'

diff --git a/.travis.yml b/.travis.yml
@@ -49,7 +49,7 @@ jobs:
       node_js: '10'
       name: 'Node.js v10'
 
-    - script: npm start test.bundle test.browser
+    - script: npm start test.browser
       name: 'Browser'
       node_js: 12
       install: npm ci # we need the native modules here

diff --git a/browser-entry.js b/browser-entry.js
@@ -210,10 +210,10 @@ Mocha.process = process;
  * Expose mocha.
  */
 
-global.Mocha = Mocha;
-global.mocha = mocha;
+mocha.Mocha = Mocha;
+mocha.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 = global;
+module.exports = Object.assign(mocha, global);