some test improvements

.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: node_js
 node_js:
   - 4
-  - 5
+  - 6
   - stable
 
 # Make sure we have new NPM.

package.json

@@ -5,31 +5,28 @@
   "bin": {
     "jsipfs": "src/cli/bin.js"
   },
-  "main": "lib/core/index.js",
-  "jsnext:main": "src/core/index.js",
+  "main": "src/core/index.js",
   "browser": {
     "libp2p-ipfs": "libp2p-ipfs-browser",
     "./src/core/default-repo.js": "./src/core/default-repo-browser.js",
-    "./lib/core/default-repo.js": "./lib/core/default-repo-browser.js",
     "./src/core/components/init-assets.js": false,
-    "./lib/core/components/init-assets.js": false,
     "fs-pull-blob-store": false,
     "glob": false,
     "rimraf": false
   },
   "scripts": {
     "lint": "aegir-lint",
     "coverage": "gulp coverage",
-    "test": "PHANTOM=off gulp test",
+    "test": "gulp test",
     "test:node": "gulp test:node",
     "test:node:core": "TEST=core npm run test:node",
     "test:node:http": "TEST=http npm run test:node",
     "test:node:cli": "TEST=cli npm run test:node",
-    "test:browser": "PHANTOM=off gulp test:browser",
+    "test:browser": "gulp test:browser",
     "build": "gulp build",
-    "release": "PHANTOM=off gulp release",
-    "release-minor": "PHANTOM=off gulp release --type minor",
-    "release-major": "PHANTOM=off gulp release --type major",
+    "release": "gulp release",
+    "release-minor": "gulp release --type minor",
+    "release-major": "gulp release --type major",
     "coverage-publish": "aegir-coverage publish"
   },
   "pre-commit": [
@@ -50,7 +47,7 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs#readme",
   "devDependencies": {
-    "aegir": "^8.1.2",
+    "aegir": "^9.0.1",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "detect-node": "^2.0.3",
@@ -71,7 +68,6 @@
   },
   "dependencies": {
     "async": "^2.0.1",
-    "babel-runtime": "^6.11.6",
     "bl": "^1.1.2",
     "boom": "^4.0.0",
     "debug": "^2.2.0",

test/core/both/index.js

@@ -1,14 +1,13 @@
 /* eslint-env mocha */
 'use strict'
 
-const fs = require('fs')
-
 describe('--both', () => {
-  const tests = fs.readdirSync(__dirname)
-
-  tests.filter((file) => {
-    return !(file === 'index.js' || file.indexOf('.') === 0)
-  }).forEach((file) => {
-    require('./' + file)
-  })
+  require('./test-bitswap')
+  require('./test-block')
+  require('./test-bootstrap')
+  require('./test-config')
+  require('./test-files')
+  require('./test-generic')
+  require('./test-init')
+  require('./test-object')
 })

test/core/both/test-bitswap.js

@@ -115,27 +115,21 @@ describe.skip('bitswap', () => {
       it('2 peers', (done) => {
         let remoteNode
         let block
-        series([
-          (cb) => makeBlock((err, _block) => {
-            expect(err).to.not.exist
-            block = _block
-            cb()
-          }),
-          // 0. Start node
-          (cb) => addNode(13, (err, _remoteNode) => {
-            expect(err).to.not.exist
-            remoteNode = _remoteNode
+        waterfall([
+          (cb) => parallel([
+            (cb) => makeBlock(cb),
+            (cb) => addNode(13, cb)
+          ], cb),
+          (res, cb) => {
+            block = res[0]
+            remoteNode = res[1]
             cb()
-          }),
-          (cb) => {
-            remoteNode.block.put(block, cb)
           },
-          (cb) => {
-            inProcNode.block.get(block.key('sha2-256'), (err, b) => {
-              expect(err).to.not.exist
-              expect(b.data.toString()).to.be.eql(block.data.toString())
-              cb()
-            })
+          (cb) => remoteNode.block.put(block, cb),
+          (cb) => inProcNode.block.get(block.key('sha2-256'), cb),
+          (b, cb) => {
+            expect(b.data).to.be.eql(block.data)
+            cb()
           }
         ], done)
       })

test/core/browser-only/index.js

@@ -1,17 +1,6 @@
 /* eslint-env mocha */
 'use strict'
 
-const fs = require('fs')
-
 describe('--browser only', () => {
-  const tests = fs.readdirSync(__dirname)
-  tests.filter((file) => {
-    if (file === 'index.js') {
-      return false
-    } else {
-      return true
-    }
-  }).forEach((file) => {
-    require('./' + file)
-  })
+  require('./test-swarm')
 })

test/http-api/index.js

@@ -20,12 +20,11 @@ describe('HTTP API', () => {
 
     clean(repoTests)
     ncp(repoExample, repoTests, (err) => {
-      expect(err).to.not.exist
+      if (err) {
+        return done(err)
+      }
 
-      http.api.start((err) => {
-        expect(err).to.not.exist
-        done()
-      })
+      http.api.start(done)
     })
   })