fix: pull in preconfigured chai from interface tests (#2510)

This is to work around chaijs/chai#1298 Fundamentally we cannot pull in chai and add plugins to it without being careful of the order of those plugins as it's a singleton. All we're really interested in is the `expect` function to just get the preconfigured one from the interface tests.
ipfs · Oct 4, 2019 · 8c01259 · 8c01259
1 parent fa99728
commit 8c01259
Show file tree

Hide file tree

Showing 79 changed files with 79 additions and 245 deletions.
diff --git a/package.json b/package.json
@@ -99,7 +99,7 @@
     "ipfs-bitswap": "^0.26.0",
     "ipfs-block": "~0.8.1",
     "ipfs-block-service": "~0.16.0",
-    "ipfs-http-client": "^38.0.0",
+    "ipfs-http-client": "^38.0.1",
     "ipfs-http-response": "~0.3.1",
     "ipfs-mfs": "^0.13.0",
     "ipfs-multipart": "^0.2.0",
@@ -195,16 +195,14 @@
   "devDependencies": {
     "aegir": "^20.3.1",
     "base64url": "^3.0.1",
-    "chai": "^4.2.0",
     "clear-module": "^4.0.0",
     "delay": "^4.1.0",
     "detect-node": "^2.0.4",
     "dir-compare": "^1.7.3",
-    "dirty-chai": "^2.0.1",
     "execa": "^2.0.4",
     "form-data": "^2.5.1",
     "hat": "0.0.3",
-    "interface-ipfs-core": "^0.115.1",
+    "interface-ipfs-core": "^0.115.3",
     "ipfs-interop": "~0.1.0",
     "ipfsd-ctl": "^0.47.2",
     "libp2p-websocket-star": "~0.10.2",

diff --git a/test/cli/bitswap.js b/test/cli/bitswap.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const runOn = require('../utils/on-and-off').on
 const PeerId = require('peer-id')
 const CID = require('cids')

diff --git a/test/cli/block.js b/test/cli/block.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const runOnAndOff = require('../utils/on-and-off')
 
 describe('block', () => runOnAndOff((thing) => {

diff --git a/test/cli/bootstrap.js b/test/cli/bootstrap.js
@@ -2,7 +2,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const runOnAndOff = require('../utils/on-and-off')
 
 describe('bootstrap', () => runOnAndOff((thing) => {

diff --git a/test/cli/commands.js b/test/cli/commands.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const runOnAndOff = require('../utils/on-and-off')
 
 const commandCount = 95

diff --git a/test/cli/config.js b/test/cli/config.js
@@ -1,10 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const fs = require('fs')
 const path = require('path')
 const runOnAndOff = require('../utils/on-and-off')

diff --git a/test/cli/daemon.js b/test/cli/daemon.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const clean = require('../utils/clean')
 const ipfsCmd = require('../utils/ipfs-exec')
 const isWindows = require('../utils/platforms').isWindows

diff --git a/test/cli/dag.js b/test/cli/dag.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const runOnAndOff = require('../utils/on-and-off')
 const path = require('path')
 

diff --git a/test/cli/dht.js b/test/cli/dht.js
@@ -2,11 +2,7 @@
 
 'use strict'
 
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
-
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const path = require('path')
 const DaemonFactory = require('ipfsd-ctl')
 const df = DaemonFactory.create({

diff --git a/test/cli/dns.js b/test/cli/dns.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const runOnAndOff = require('../utils/on-and-off')
 const isIPFS = require('is-ipfs')
 

diff --git a/test/cli/file.js b/test/cli/file.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const runOnAndOff = require('../utils/on-and-off')
 const file = 'QmR56UJmAaZLXLdTT1ALrE9vVqV8soUEekm9BMd4FnuYqV'
 const dir = 'Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z'

diff --git a/test/cli/files.js b/test/cli/files.js
@@ -3,7 +3,7 @@
 
 const fs = require('fs')
 const os = require('os')
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const path = require('path')
 const hat = require('hat')
 const compareDir = require('dir-compare').compareSync

diff --git a/test/cli/general.js b/test/cli/general.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const runOnAndOff = require('../utils/on-and-off')
 
 describe('general cli options', () => runOnAndOff.off((thing) => {

diff --git a/test/cli/id.js b/test/cli/id.js
@@ -2,12 +2,9 @@
 'use strict'
 
 const sinon = require('sinon')
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const YargsPromise = require('yargs-promise')
 const clearModule = require('clear-module')
-chai.use(dirtyChai)
 
 describe('id', () => {
   let cli

diff --git a/test/cli/init.js b/test/cli/init.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const path = require('path')
 const fs = require('fs')
 const clean = require('../utils/clean')

diff --git a/test/cli/key.js b/test/cli/key.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const runOnAndOff = require('../utils/on-and-off')
 const hat = require('hat')
 

diff --git a/test/cli/ls.js b/test/cli/ls.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const runOnAndOff = require('../utils/on-and-off')
 const delay = require('delay')
 

diff --git a/test/cli/name-pubsub.js b/test/cli/name-pubsub.js
@@ -2,10 +2,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const path = require('path')
 const ipfsExec = require('../utils/ipfs-exec')
 

diff --git a/test/cli/object.js b/test/cli/object.js
@@ -3,7 +3,7 @@
 'use strict'
 
 const hat = require('hat')
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const runOnAndOff = require('../utils/on-and-off')
 const UnixFs = require('ipfs-unixfs')
 const path = require('path')

diff --git a/test/cli/parser.js b/test/cli/parser.js
@@ -1,10 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const parser = require('../../src/cli/parser')
 const YargsPromise = require('yargs-promise')
 

diff --git a/test/cli/pin.js b/test/cli/pin.js
@@ -2,7 +2,7 @@
 /* eslint max-nested-callbacks: ["error", 8] */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const CID = require('cids')
 const runOnAndOff = require('../utils/on-and-off')
 const path = require('path')

diff --git a/test/cli/ping.js b/test/cli/ping.js
@@ -2,17 +2,14 @@
 /* eslint-env mocha */
 'use strict'
 
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const DaemonFactory = require('ipfsd-ctl')
 const ipfsExec = require('../utils/ipfs-exec')
 const path = require('path')
 const df = DaemonFactory.create({
   type: 'js',
   IpfsClient: require('ipfs-http-client')
 })
-const expect = chai.expect
-chai.use(dirtyChai)
 
 const config = {
   Bootstrap: [],

diff --git a/test/cli/progress-bar.js b/test/cli/progress-bar.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const createProgressBar = require('../../src/cli/utils').createProgressBar
 
 describe('progress bar', () => {

diff --git a/test/cli/pubsub.js b/test/cli/pubsub.js
@@ -2,10 +2,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const delay = require('delay')
 const series = require('async/series')
 const ipfsExec = require('../utils/ipfs-exec')

diff --git a/test/cli/refs-local.js b/test/cli/refs-local.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const runOnAndOff = require('../utils/on-and-off')
 
 describe('refs-local', () => runOnAndOff((thing) => {

diff --git a/test/cli/refs.js b/test/cli/refs.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const runOnAndOff = require('../utils/on-and-off')
 
 // Note: There are more comprehensive tests in interface-js-ipfs-core

diff --git a/test/cli/repo.js b/test/cli/repo.js
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const repoVersion = require('ipfs-repo').repoVersion
 const runOnAndOff = require('../utils/on-and-off')
 

diff --git a/test/cli/swarm.js b/test/cli/swarm.js
@@ -2,10 +2,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const sinon = require('sinon')
 const ipfsExec = require('../utils/ipfs-exec')
 const path = require('path')

diff --git a/test/cli/version.js b/test/cli/version.js
@@ -3,7 +3,7 @@
 'use strict'
 
 const os = require('os')
-const expect = require('chai').expect
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const repoVersion = require('ipfs-repo').repoVersion
 const pkgversion = require('../../package.json').version
 const runOnAndOff = require('../utils/on-and-off')

diff --git a/test/core/bitswap.spec.js b/test/core/bitswap.spec.js
@@ -3,10 +3,7 @@
 'use strict'
 
 const hat = require('hat')
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const _ = require('lodash')
 const series = require('async/series')
 const waterfall = require('async/waterfall')

diff --git a/test/core/block.spec.js b/test/core/block.spec.js
@@ -2,10 +2,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const hat = require('hat')
 
 const IPFSFactory = require('ipfsd-ctl')

diff --git a/test/core/bootstrap.spec.js b/test/core/bootstrap.spec.js
@@ -1,11 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
-
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const isNode = require('detect-node')
 const IPFS = require('../../src')
 

diff --git a/test/core/circuit-relay.js b/test/core/circuit-relay.js
@@ -2,11 +2,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
-
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const waterfall = require('async/waterfall')
 const multiaddr = require('multiaddr')
 const crypto = require('crypto')

diff --git a/test/core/config.spec.js b/test/core/config.spec.js
@@ -1,11 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
-
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const config = require('../../src/core/config')
 
 describe('config', () => {

diff --git a/test/core/create-node.spec.js b/test/core/create-node.spec.js
@@ -2,10 +2,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
+const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const series = require('async/series')
 const sinon = require('sinon')
 const waterfall = require('async/waterfall')