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

fix: make tests consistent across js-ipfs/go-ipfs #158

Merged
merged 4 commits into from
Oct 18, 2017
Merged

fix: make tests consistent across js-ipfs/go-ipfs #158

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd880b5
feat: add progress bar tests
dryajov Oct 6, 2017
c312539
feat: fixing progress bar tests
dryajov Oct 10, 2017
7751aa4
fix: consistent tests across js-ipfs and go-ipfs progress
dryajov Oct 18, 2017
5c0f00c
fix: rename progress acumulators for clarity
dryajov Oct 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,20 @@ module.exports = (common) => {
const expectedMultihash = 'Qme79tX2bViL26vNjPsF3DP1R9rMKMvnPYJiKTTKPrXJjq'

let progCount = 0
let progress = 0
let accumProgress = 0
const handler = (p) => {
progCount += 1
progress += p
accumProgress = p
}

ipfs.files.add(bigFile, {progress: handler}, (err, res) => {
ipfs.files.add(bigFile, { progress: handler }, (err, res) => {
expect(err).to.not.exist()
expect(res).to.have.length(1)
const file = res[0]
expect(file.hash).to.equal(expectedMultihash)
expect(file.path).to.equal(file.hash)
expect(progCount).to.equal(58)
expect(progress).to.equal(bigFile.byteLength)
expect(accumProgress).to.equal(bigFile.byteLength)
done()
})
})
Expand Down Expand Up @@ -214,20 +214,20 @@ module.exports = (common) => {
}, 0)

let progCount = 0
let progress = 0
let accumProgress = 0
const handler = (p) => {
progCount += 1
progress += p
accumProgress += p
}

ipfs.files.add(dirs, {progress: handler}, (err, res) => {
ipfs.files.add(dirs, { progress: handler }, (err, res) => {
expect(err).to.not.exist()
const root = res[res.length - 1]

expect(root.path).to.equal('test-folder')
expect(root.hash).to.equal(expectedRootMultihash)
expect(progCount).to.equal(8)
expect(progress).to.equal(total)
expect(accumProgress).to.be.at.least(total)
done()
})
})
Expand Down