Skip to content
This repository was archived by the owner on Mar 10, 2020. It is now read-only.

Commit cd65c72

Browse files
dignifiedquiredignifiedquire
committedNov 27, 2015
Finish conversion
·
v42.0.04.0.0
1 parent 43e059a commit cd65c72

14 files changed

+73
-130
lines changed
 

‎test/api/cat.spec.js

+3-7
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,14 @@ if (isNode) {
1515
describe('.cat', () => {
1616
it('cat', done => {
1717
apiClients['a'].cat('Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP', (err, res) => {
18-
if (err) {
19-
throw err
20-
}
18+
expect(err).to.not.exist
2119

2220
let buf = ''
2321
res
2422
.on('error', err => { throw err })
2523
.on('data', data => buf += data)
2624
.on('end', () => {
27-
assert.equal(buf, testfile)
25+
expect(buf).to.be.equal(testfile.toString())
2826
done()
2927
})
3028
})
@@ -36,9 +34,7 @@ describe('.cat', () => {
3634
}
3735

3836
apiClients['a'].cat('Qme79tX2bViL26vNjPsF3DP1R9rMKMvnPYJiKTTKPrXJjq', (err, res) => {
39-
if (err) {
40-
throw err
41-
}
37+
expect(err).to.not.exist
4238

4339
testfileBig = require('fs').createReadStream(__dirname + '/../15mb.random', { bufferSize: 128 })
4440

‎test/api/dht.spec.js

+9-15
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,36 @@ describe('.dht', () => {
44
it('returns an error when getting a non-existent key from the DHT',
55
done => {
66
apiClients['a'].dht.get('non-existent', {timeout: '100ms'}, (err, value) => {
7-
assert(err)
7+
console.log(err, value)
8+
expect(err).to.be.an.instanceof(Error)
89
done()
910
})
1011
})
1112

1213
it('puts and gets a key value pair in the DHT', done => {
1314
apiClients['a'].dht.put('scope', 'interplanetary', (err, res) => {
14-
if (err) {
15-
throw err
16-
}
15+
expect(err).to.not.exist
1716

18-
assert.equal(typeof res, 'object')
17+
expect(res).to.be.an('array')
1918

20-
return done()
19+
done()
2120

2221
// non ipns or pk hashes fail to fetch, known bug
2322
// bug: https://github.com/ipfs/go-ipfs/issues/1923#issuecomment-152932234
2423
// apiClients['a'].dht.get('scope', (err, value) => {
2524
// console.log('->>', err, value)
26-
// if (err) {
27-
// throw err
28-
// }
29-
// assert.equal(value, 'interplanetary')
25+
// expect(err).to.not.exist
26+
// expect(value).to.be.equal('interplanetary')
3027
// done()
3128
// })
3229
})
3330
})
3431

3532
it('.dht.findprovs', done => {
3633
apiClients['a'].dht.findprovs('Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP', (err, res) => {
37-
if (err) {
38-
throw err
39-
}
34+
expect(err).to.not.exist
4035

41-
assert.equal(typeof res, 'object')
42-
assert(res)
36+
expect(res).to.be.an('array')
4337
done()
4438
})
4539
})

‎test/api/diag.spec.js

+6-10
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,18 @@
33
describe('.diag', () => {
44
it('.diag.net', done => {
55
apiClients['a'].diag.net((err, res) => {
6-
if (err) {
7-
throw err
8-
}
9-
assert(res)
6+
expect(err).to.not.exist
7+
expect(res).to.exist
108
done()
119
})
1210
})
1311

1412
it('.diag.sys', done => {
1513
apiClients['a'].diag.sys((err, res) => {
16-
if (err) {
17-
throw err
18-
}
19-
assert(res)
20-
assert(res.memory)
21-
assert(res.diskinfo)
14+
expect(err).to.not.exist
15+
expect(res).to.exist
16+
expect(res).to.have.a.property('memory')
17+
expect(res).to.have.a.property('diskinfo')
2218
done()
2319
})
2420
})

‎test/api/id.spec.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
describe('.id', () => {
44
it('id', done => {
55
apiClients['a'].id((err, res) => {
6-
if (err) throw err
7-
const id = res
8-
assert(id.ID)
9-
assert(id.PublicKey)
6+
expect(err).to.not.exist
7+
expect(res).to.have.a.property('ID')
8+
expect(res).to.have.a.property('PublicKey')
109
done()
1110
})
1211
})

‎test/api/index.spec.js

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

33
describe('API', () => {
44
it('has the api object', () => {
5-
assert(apiClients['a'])
6-
assert(apiClients['a'].id)
5+
expect(apiClients['a']).to.exist
6+
expect(apiClients['a']).to.have.a.property('id')
77
})
88
})

‎test/api/log.spec.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
describe('.log', () => {
44
it('.log.tail', done => {
55
apiClients['a'].log.tail((err, res) => {
6-
if (err) {
7-
throw err
8-
}
6+
expect(err).to.not.exist
7+
98
res.once('data', obj => {
10-
assert(obj)
11-
assert.equal(typeof obj, 'object')
9+
expect(obj).to.be.an('object')
1210
done()
1311
})
1412
})

‎test/api/name.spec.js

+7-10
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,20 @@ describe('.name', () => {
55

66
it('.name.publish', done => {
77
apiClients['a'].name.publish('Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP', (err, res) => {
8-
if (err) {
9-
throw err
10-
}
11-
assert(res)
8+
expect(err).to.not.exist
129
name = res
10+
expect(name).to.exist
1311
done()
1412
})
1513
})
1614

1715
it('.name.resolve', done => {
1816
apiClients['a'].name.resolve(name.Name, (err, res) => {
19-
if (err) {
20-
throw err
21-
}
22-
23-
assert(res)
24-
assert.deepEqual(res, { Path: '/ipfs/' + name.Value })
17+
expect(err).to.not.exist
18+
expect(res).to.exist
19+
expect(res).to.be.eql({
20+
Path: '/ipfs/' + name.Value
21+
})
2522
done()
2623
})
2724
})

‎test/api/object.spec.js

+17-32
Original file line numberDiff line numberDiff line change
@@ -8,47 +8,41 @@ describe('.object', () => {
88

99
it('object.put', done => {
1010
apiClients['a'].object.put(testObject, 'json', (err, res) => {
11-
if (err) throw err
12-
const obj = res
13-
assert.equal(obj.Hash, testObjectHash)
14-
assert.equal(obj.Links.length, 0)
11+
expect(err).to.not.exist
12+
expect(res).to.have.a.property('Hash', testObjectHash)
13+
expect(res.Links).to.be.empty
1514
done()
1615
})
1716
})
1817

1918
it('object.get', done => {
2019
apiClients['a'].object.get(testObjectHash, (err, res) => {
21-
if (err) {
22-
throw err
23-
}
24-
const obj = res
25-
assert.equal(obj.Data, 'testdata')
26-
assert.equal(obj.Links.length, 0)
20+
expect(err).to.not.exist
21+
expect(res).to.have.a.property('Data', 'testdata')
22+
expect(res.Links).to.be.empty
2723
done()
2824
})
2925
})
3026

3127
it('object.data', done => {
3228
apiClients['a'].object.data(testObjectHash, (err, res) => {
33-
if (err) throw err
29+
expect(err).to.not.exist
3430

3531
let buf = ''
3632
res
3733
.on('error', err => { throw err })
3834
.on('data', data => buf += data)
3935
.on('end', () => {
40-
assert.equal(buf, 'testdata')
36+
expect(buf).to.equal('testdata')
4137
done()
4238
})
4339
})
4440
})
4541

4642
it('object.stat', done => {
4743
apiClients['a'].object.stat(testObjectHash, (err, res) => {
48-
if (err) {
49-
throw err
50-
}
51-
assert.deepEqual(res, {
44+
expect(err).to.not.exist
45+
expect(res).to.be.eql({
5246
Hash: 'QmPTkMuuL6PD8L2SwTwbcs1NPg14U8mRzerB1ZrrBrkSDD',
5347
NumLinks: 0,
5448
BlockSize: 10,
@@ -62,11 +56,9 @@ describe('.object', () => {
6256

6357
it('object.links', done => {
6458
apiClients['a'].object.links(testObjectHash, (err, res) => {
65-
if (err) {
66-
throw err
67-
}
59+
expect(err).to.not.exist
6860

69-
assert.deepEqual(res, {
61+
expect(res).to.be.eql({
7062
Hash: 'QmPTkMuuL6PD8L2SwTwbcs1NPg14U8mRzerB1ZrrBrkSDD',
7163
Links: []
7264
})
@@ -76,23 +68,16 @@ describe('.object', () => {
7668

7769
it('object.patch', done => {
7870
apiClients['a'].object.put(testPatchObject, 'json', (err, res) => {
79-
if (err) {
80-
throw err
81-
}
71+
expect(err).to.not.exist
8272
apiClients['a'].object.patch(testObjectHash, ['add-link', 'next', testPatchObjectHash], (err, res) => {
83-
if (err) {
84-
throw err
85-
}
86-
87-
assert.deepEqual(res, {
73+
expect(err).to.not.exist
74+
expect(res).to.be.eql({
8875
Hash: 'QmZFdJ3CQsY4kkyQtjoUo8oAzsEs5BNguxBhp8sjQMpgkd',
8976
Links: null
9077
})
9178
apiClients['a'].object.get(res.Hash, (err, res2) => {
92-
if (err) {
93-
throw err
94-
}
95-
assert.deepEqual(res2, {
79+
expect(err).to.not.exist
80+
expect(res2).to.be.eql({
9681
Data: 'testdata',
9782
Links: [{
9883
Name: 'next',

‎test/api/pin.spec.js

+9-17
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,28 @@
33
describe('.pin', () => {
44
it('.pin.add', done => {
55
apiClients['b'].pin.add('Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP', {recursive: false}, (err, res) => {
6-
if (err) {
7-
throw err
8-
}
9-
assert.equal(res.Pinned[0], 'Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP')
6+
expect(err).to.not.exist
7+
expect(res.Pinned[0]).to.be.equal('Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP')
108
done()
119
})
1210
})
1311

1412
it('.pin.list', done => {
1513
apiClients['b'].pin.list((err, res) => {
16-
if (err) {
17-
throw err
18-
}
19-
assert(res)
14+
expect(err).to.not.exist
15+
expect(res).to.exist
2016
done()
2117
})
2218
})
2319

2420
it('.pin.remove', done => {
2521
apiClients['b'].pin.remove('Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP', {recursive: false}, (err, res) => {
26-
if (err) {
27-
throw err
28-
}
29-
assert(res)
22+
expect(err).to.not.exist
23+
expect(res).to.exist
3024
apiClients['b'].pin.list('direct', (err, res) => {
31-
if (err) {
32-
throw err
33-
}
34-
assert(res)
35-
assert.equal(Object.keys(res.Keys).length, 0)
25+
expect(err).to.not.exist
26+
expect(res).to.exist
27+
expect(res.Keys).to.be.empty
3628
done()
3729
})
3830
})

‎test/api/ping.spec.js

+3-9
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,11 @@ describe('.ping', () => {
88
}
99

1010
apiClients['b'].id((err, id) => {
11-
if (err) {
12-
throw err
13-
}
11+
expect(err).to.not.exist
1412

1513
apiClients['a'].ping(id.ID, (err, res) => {
16-
if (err) {
17-
throw err
18-
}
19-
20-
assert(res)
21-
assert(res.Success)
14+
expect(err).to.not.exist
15+
expect(res).to.have.a.property('Success')
2216
done()
2317
})
2418
})

‎test/api/refs.spec.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ describe('.refs', () => {
99
}
1010

1111
apiClients['a'].refs(folder, {'format': '<src> <dst> <linkname>'}, (err, objs) => {
12-
if (err) {
13-
throw err
14-
}
12+
expect(err).to.not.exist
1513

1614
const result = [{
1715
Ref: 'QmSzLpCVbWnEm3XoTWnv6DT6Ju5BsVoLhzvxKXZeQ2cmdg QmcUYKmQxmTcFom4R4UZP7FWeQzgJkwcFn51XrvsMy7PE9 add.js',
@@ -35,7 +33,7 @@ describe('.refs', () => {
3533
Ref: 'QmSzLpCVbWnEm3XoTWnv6DT6Ju5BsVoLhzvxKXZeQ2cmdg QmbkMNB6rwfYAxRvnG9CWJ6cKKHEdq2ZKTozyF5FQ7H8Rs version.js',
3634
Err: ''
3735
}]
38-
assert.deepEqual(objs, result)
36+
expect(objs).to.eql(result)
3937

4038
done()
4139
})

‎test/api/swarm.spec.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
describe('.swarm', () => {
44
it('.swarm.peers', done => {
55
apiClients['a'].swarm.peers((err, res) => {
6-
if (err) {
7-
throw err
8-
}
6+
expect(err).to.not.exist
97

10-
assert(res.Strings.length >= 2)
8+
expect(res.Strings).to.have.length.above(1)
119
done()
1210
})
1311
})

‎test/api/version.spec.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
describe('.version', () => {
44
it('checks the version', done => {
55
apiClients['a'].version((err, res) => {
6-
if (err) {
7-
throw err
8-
}
9-
assert(res)
10-
assert(res.Version)
6+
expect(err).to.not.exist
7+
expect(res).to.have.a.property('Version')
118
console.log(' - running against version', res.Version)
129
done()
1310
})

‎test/constructor.spec.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
'use strict'
22

33
const ipfsAPI = require('../src/index.js')
4-
const assert = require('assert')
54

65
describe('ipfsAPI constructor tests', () => {
76
describe('parameter permuations', () => {
87
const apiAddrs = require('./tmp-disposable-nodes-addrs.json')
98
const apiAddr = apiAddrs.a.split('/')
109

1110
function clientWorks (client, done) {
12-
client.id((err, res) => {
13-
if (err) throw err
14-
const id = res
15-
assert(id.ID)
16-
assert(id.PublicKey)
11+
client.id((err, id) => {
12+
expect(err).to.not.exist
13+
14+
expect(id).to.have.a.property('ID')
15+
expect(id).to.have.a.property('PublicKey')
1716
done()
1817
})
1918
}

0 commit comments

Comments
 (0)
This repository has been archived.