Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

Commit b373ce3

Browse files
achingbrainachingbrain
committed
fix: pull in preconfigured chai from interface tests
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.
1 parent 1dca93d commit b373ce3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+79
-245
lines changed

‎package.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"ipfs-bitswap": "^0.26.0",
100100
"ipfs-block": "~0.8.1",
101101
"ipfs-block-service": "~0.16.0",
102-
"ipfs-http-client": "^38.0.0",
102+
"ipfs-http-client": "^38.0.1",
103103
"ipfs-http-response": "~0.3.1",
104104
"ipfs-mfs": "^0.13.0",
105105
"ipfs-multipart": "^0.2.0",
@@ -195,16 +195,14 @@
195195
"devDependencies": {
196196
"aegir": "^20.3.1",
197197
"base64url": "^3.0.1",
198-
"chai": "^4.2.0",
199198
"clear-module": "^4.0.0",
200199
"delay": "^4.1.0",
201200
"detect-node": "^2.0.4",
202201
"dir-compare": "^1.7.3",
203-
"dirty-chai": "^2.0.1",
204202
"execa": "^2.0.4",
205203
"form-data": "^2.5.1",
206204
"hat": "0.0.3",
207-
"interface-ipfs-core": "^0.115.1",
205+
"interface-ipfs-core": "^0.115.3",
208206
"ipfs-interop": "~0.1.0",
209207
"ipfsd-ctl": "^0.47.2",
210208
"libp2p-websocket-star": "~0.10.2",

‎test/cli/bitswap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const runOn = require('../utils/on-and-off').on
66
const PeerId = require('peer-id')
77
const CID = require('cids')

‎test/cli/block.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const runOnAndOff = require('../utils/on-and-off')
66

77
describe('block', () => runOnAndOff((thing) => {

‎test/cli/bootstrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* eslint-env mocha */
33
'use strict'
44

5-
const expect = require('chai').expect
5+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
66
const runOnAndOff = require('../utils/on-and-off')
77

88
describe('bootstrap', () => runOnAndOff((thing) => {

‎test/cli/commands.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const runOnAndOff = require('../utils/on-and-off')
66

77
const commandCount = 95

‎test/cli/config.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const chai = require('chai')
5-
const dirtyChai = require('dirty-chai')
6-
const expect = chai.expect
7-
chai.use(dirtyChai)
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
85
const fs = require('fs')
96
const path = require('path')
107
const runOnAndOff = require('../utils/on-and-off')

‎test/cli/daemon.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const clean = require('../utils/clean')
66
const ipfsCmd = require('../utils/ipfs-exec')
77
const isWindows = require('../utils/platforms').isWindows

‎test/cli/dag.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const runOnAndOff = require('../utils/on-and-off')
66
const path = require('path')
77

‎test/cli/dht.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22

33
'use strict'
44

5-
const chai = require('chai')
6-
const dirtyChai = require('dirty-chai')
7-
const expect = chai.expect
8-
chai.use(dirtyChai)
9-
5+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
106
const path = require('path')
117
const DaemonFactory = require('ipfsd-ctl')
128
const df = DaemonFactory.create({

‎test/cli/dns.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const runOnAndOff = require('../utils/on-and-off')
66
const isIPFS = require('is-ipfs')
77

‎test/cli/file.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const runOnAndOff = require('../utils/on-and-off')
66
const file = 'QmR56UJmAaZLXLdTT1ALrE9vVqV8soUEekm9BMd4FnuYqV'
77
const dir = 'Qmaj2NmcyAXT8dFmZRRytE12wpcaHADzbChKToMEjBsj5Z'

‎test/cli/files.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
const fs = require('fs')
55
const os = require('os')
6-
const expect = require('chai').expect
6+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
77
const path = require('path')
88
const hat = require('hat')
99
const compareDir = require('dir-compare').compareSync

‎test/cli/general.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const runOnAndOff = require('../utils/on-and-off')
66

77
describe('general cli options', () => runOnAndOff.off((thing) => {

‎test/cli/id.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
'use strict'
33

44
const sinon = require('sinon')
5-
const chai = require('chai')
6-
const dirtyChai = require('dirty-chai')
7-
const expect = chai.expect
5+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
86
const YargsPromise = require('yargs-promise')
97
const clearModule = require('clear-module')
10-
chai.use(dirtyChai)
118

129
describe('id', () => {
1310
let cli

‎test/cli/init.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const path = require('path')
66
const fs = require('fs')
77
const clean = require('../utils/clean')

‎test/cli/key.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const runOnAndOff = require('../utils/on-and-off')
66
const hat = require('hat')
77

‎test/cli/ls.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const runOnAndOff = require('../utils/on-and-off')
66
const delay = require('delay')
77

‎test/cli/name-pubsub.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
/* eslint-env mocha */
33
'use strict'
44

5-
const chai = require('chai')
6-
const dirtyChai = require('dirty-chai')
7-
const expect = chai.expect
8-
chai.use(dirtyChai)
5+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
96
const path = require('path')
107
const ipfsExec = require('../utils/ipfs-exec')
118

‎test/cli/object.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'use strict'
44

55
const hat = require('hat')
6-
const expect = require('chai').expect
6+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
77
const runOnAndOff = require('../utils/on-and-off')
88
const UnixFs = require('ipfs-unixfs')
99
const path = require('path')

‎test/cli/parser.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const chai = require('chai')
5-
const dirtyChai = require('dirty-chai')
6-
const expect = chai.expect
7-
chai.use(dirtyChai)
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
85
const parser = require('../../src/cli/parser')
96
const YargsPromise = require('yargs-promise')
107

‎test/cli/pin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* eslint max-nested-callbacks: ["error", 8] */
33
'use strict'
44

5-
const expect = require('chai').expect
5+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
66
const CID = require('cids')
77
const runOnAndOff = require('../utils/on-and-off')
88
const path = require('path')

‎test/cli/ping.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22
/* eslint-env mocha */
33
'use strict'
44

5-
const chai = require('chai')
6-
const dirtyChai = require('dirty-chai')
5+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
76
const DaemonFactory = require('ipfsd-ctl')
87
const ipfsExec = require('../utils/ipfs-exec')
98
const path = require('path')
109
const df = DaemonFactory.create({
1110
type: 'js',
1211
IpfsClient: require('ipfs-http-client')
1312
})
14-
const expect = chai.expect
15-
chai.use(dirtyChai)
1613

1714
const config = {
1815
Bootstrap: [],

‎test/cli/progress-bar.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const createProgressBar = require('../../src/cli/utils').createProgressBar
66

77
describe('progress bar', () => {

‎test/cli/pubsub.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
/* eslint-env mocha */
33
'use strict'
44

5-
const chai = require('chai')
6-
const dirtyChai = require('dirty-chai')
7-
const expect = chai.expect
8-
chai.use(dirtyChai)
5+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
96
const delay = require('delay')
107
const series = require('async/series')
118
const ipfsExec = require('../utils/ipfs-exec')

‎test/cli/refs-local.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const runOnAndOff = require('../utils/on-and-off')
66

77
describe('refs-local', () => runOnAndOff((thing) => {

‎test/cli/refs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const runOnAndOff = require('../utils/on-and-off')
66

77
// Note: There are more comprehensive tests in interface-js-ipfs-core

‎test/cli/repo.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const expect = require('chai').expect
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
55
const repoVersion = require('ipfs-repo').repoVersion
66
const runOnAndOff = require('../utils/on-and-off')
77

‎test/cli/swarm.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
/* eslint-env mocha */
33
'use strict'
44

5-
const chai = require('chai')
6-
const dirtyChai = require('dirty-chai')
7-
const expect = chai.expect
8-
chai.use(dirtyChai)
5+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
96
const sinon = require('sinon')
107
const ipfsExec = require('../utils/ipfs-exec')
118
const path = require('path')

‎test/cli/version.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'use strict'
44

55
const os = require('os')
6-
const expect = require('chai').expect
6+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
77
const repoVersion = require('ipfs-repo').repoVersion
88
const pkgversion = require('../../package.json').version
99
const runOnAndOff = require('../utils/on-and-off')

‎test/core/bitswap.spec.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
'use strict'
44

55
const hat = require('hat')
6-
const chai = require('chai')
7-
const dirtyChai = require('dirty-chai')
8-
const expect = chai.expect
9-
chai.use(dirtyChai)
6+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
107
const _ = require('lodash')
118
const series = require('async/series')
129
const waterfall = require('async/waterfall')

‎test/core/block.spec.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
/* eslint-env mocha */
33
'use strict'
44

5-
const chai = require('chai')
6-
const dirtyChai = require('dirty-chai')
7-
const expect = chai.expect
8-
chai.use(dirtyChai)
5+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
96
const hat = require('hat')
107

118
const IPFSFactory = require('ipfsd-ctl')

‎test/core/bootstrap.spec.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const chai = require('chai')
5-
const dirtyChai = require('dirty-chai')
6-
const expect = chai.expect
7-
chai.use(dirtyChai)
8-
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
95
const isNode = require('detect-node')
106
const IPFS = require('../../src')
117

‎test/core/circuit-relay.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
/* eslint-env mocha */
33
'use strict'
44

5-
const chai = require('chai')
6-
const dirtyChai = require('dirty-chai')
7-
const expect = chai.expect
8-
chai.use(dirtyChai)
9-
5+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
106
const waterfall = require('async/waterfall')
117
const multiaddr = require('multiaddr')
128
const crypto = require('crypto')

‎test/core/config.spec.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const chai = require('chai')
5-
const dirtyChai = require('dirty-chai')
6-
const expect = chai.expect
7-
chai.use(dirtyChai)
8-
4+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
95
const config = require('../../src/core/config')
106

117
describe('config', () => {

‎test/core/create-node.spec.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
/* eslint-env mocha */
33
'use strict'
44

5-
const chai = require('chai')
6-
const dirtyChai = require('dirty-chai')
7-
const expect = chai.expect
8-
chai.use(dirtyChai)
5+
const { expect } = require('interface-ipfs-core/src/utils/mocha')
96
const series = require('async/series')
107
const sinon = require('sinon')
118
const waterfall = require('async/waterfall')

0 commit comments

Comments
 (0)