Skip to content
This repository was archived by the owner on Aug 1, 2023. It is now read-only.

Commit 62f867a

Browse files
author
Pedro Santos
committed
fix: fix browser tests
1 parent 42f2f78 commit 62f867a

7 files changed

Lines changed: 206 additions & 208 deletions

File tree

.aegir.js

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,26 @@ module.exports = {
2020
},
2121
hooks: {
2222
browser: {
23-
pre: (done) => {
24-
parallel([
25-
(cb) => server.start(cb),
26-
(cb) => {
23+
pre: async () => {
24+
await server.start()
25+
return new Promise((resolve, reject) => {
2726
rendezvous.start({
2827
port: 24642
2928
}, (err, _rzserver) => {
3029
if (err) {
31-
return done(err)
30+
return reject(err)
3231
}
3332
rzserver = _rzserver
34-
cb()
33+
resolve()
3534
})
36-
}
37-
], done)
35+
})
3836
},
39-
post: (done) => {
40-
parallel([
41-
(cb) => server.stop(cb),
42-
(cb) => rzserver.stop(cb)
43-
], done)
37+
post: async () => {
38+
await server.stop()
39+
40+
return new Promise((resolve) => {
41+
rzserver.stop(resolve)
42+
})
4443
}
4544
}
4645
}

package-lock.json

Lines changed: 128 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
"go-ipfs-dep": "~0.4.22",
5757
"hat": "~0.0.3",
5858
"ipfs": "^0.37.1",
59-
"ipfs-http-client": "^37.0.1",
59+
"ipfs-http-client": "^38.2.0",
6060
"ipfs-repo": "~0.26.6",
6161
"ipfs-unixfs": "~0.1.16",
62-
"ipfsd-ctl": "~0.47.1",
62+
"ipfsd-ctl": "ipfs/js-ipfsd-ctl#fix/downgrade-multiaddr",
6363
"ipns": "~0.5.1",
6464
"is-ci": "^2.0.0",
6565
"is-os": "^1.0.1",

test/circuit.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const baseTest = {
2121
}
2222

2323
describe('circuit', () => {
24-
const tests = all
24+
const tests = browser
2525

2626
if (!isNode) {
2727
Object.assign(tests, browser)
@@ -52,8 +52,8 @@ describe('circuit', () => {
5252

5353
after(() => Promise.all(nodes.map((node) => node.stop())))
5454

55-
it('connect', (done) => {
56-
tests[test].connect(nodeA, nodeB, relay, done)
55+
it('connect', () => {
56+
return tests[test].connect(nodeA, nodeB, relay)
5757
})
5858

5959
it('send', (done) => {

0 commit comments

Comments
 (0)