Resolve circular dep issue with t.mochaGlobals() function

tapjs · Jul 21, 2020 · 0e832e8 · 0e832e8
1 parent 08b7268
commit 0e832e8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/lib/tap.js b/lib/tap.js
@@ -163,7 +163,7 @@ const tap = new TAP(opt)
 
 module.exports = tap.default = tap.t = tap
 tap.mocha = require('./mocha.js')
-tap.mochaGlobals = tap.mocha.global
+tap.mochaGlobals = () => tap.mocha.global()
 
 tap.Test = Test
 tap.Spawn = Spawn

diff --git a/...s/test-tap-plan-unsatisied.js-TAP.test.js → ...ots/test-tap-mocha-globals.js-TAP.test.js b/...s/test-tap-plan-unsatisied.js-TAP.test.js → ...ots/test-tap-mocha-globals.js-TAP.test.js
@@ -5,22 +5,21 @@
  * Make sure to inspect the output below.  Do not ignore changes!
  */
 'use strict'
-exports[`test/tap/plan-unsatisied.js TAP > exit status 1`] = `
+exports[`test/tap/mocha-globals.js TAP > exit status 1`] = `
 Object {
-  "code": 1,
+  "code": 0,
   "signal": null,
 }
 `
 
-exports[`test/tap/plan-unsatisied.js TAP > stderr 1`] = `
+exports[`test/tap/mocha-globals.js TAP > stderr 1`] = `
 
 `
 
-exports[`test/tap/plan-unsatisied.js TAP > stdout 1`] = `
+exports[`test/tap/mocha-globals.js TAP > stdout 1`] = `
 TAP version 13
-1..99
-# test count(0) != plan(99)
-# failed 1 test
+ok 1 - should be equal
+1..1
 # {time}
 
 `
diff --git a/test/tap/mocha-globals.js b/test/tap/mocha-globals.js
@@ -0,0 +1,4 @@
+require('./')(t => {
+  t.mochaGlobals()
+  t.equal(typeof describe, 'function')
+})
diff --git a/test/tap/plan-unsatisied.js b/test/tap/plan-unsatisied.js