more happy tests

Author: dignifiedquire

package.json

@@ -66,6 +66,7 @@
     "ncp": "^2.0.0",
     "nexpect": "^0.5.0",
     "pre-commit": "^1.2.1",
+    "qs": "^6.3.0",
     "rimraf": "^2.5.4",
     "stream-to-promise": "^2.2.0",
     "transform-loader": "^0.2.3"

src/core/components/bootstrap.js

@@ -23,7 +23,7 @@ module.exports = function bootstrap (self) {
         }
         if (args.default) {
           config.Bootstrap = defaultNodes
-        } else {
+        } else if (multiaddr) {
           config.Bootstrap.push(multiaddr)
         }
         self._repo.config.set(config, (err) => {

src/http-api/resources/bootstrap.js

@@ -11,21 +11,6 @@ function applyError (reply, err) {
   }).code(500).takeover()
 }
 
-// common pre request handler that parses the args and returns `key` which is assigned to `request.pre.args`
-exports.parseKey = (request, reply) => {
-  if (!request.query.arg) {
-    return applyError(reply, new Error("Argument 'multiaddr' is required"))
-  }
-
-  try {
-    return reply({
-      addr: multiaddr(request.query.arg)
-    })
-  } catch (err) {
-    return applyError(reply, new Error('Not a valid multiaddr'))
-  }
-}
-
 exports.list = (request, reply) => {
   const ipfs = request.server.app.ipfs
 

src/http-api/routes/bootstrap.js

@@ -9,7 +9,9 @@ module.exports = (server) => {
   api.route({
     method: '*',
     path: '/api/v0/bootstrap',
-    handler: resources.bootstrap.list
+    config: {
+      handler: resources.bootstrap.list
+    }
   })
 
   // https://github.com/ipfs/http-api-spec/blob/master/apiary.apib#L866

test/http-api/custom-ipfs-api/test-bootstrap.js

@@ -6,7 +6,7 @@ const expect = require('chai').expect
 module.exports = (ctl) => {
   describe('.bootstrap', () => {
     const invalidArg = 'this/Is/So/Invalid/'
-    const validIp4 = '/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z'
+    const validIp4 = '/ip4/101.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z'
     let peers
 
     describe('.add', () => {
@@ -30,7 +30,6 @@ module.exports = (ctl) => {
           expect(err).to.not.exist
           peers = res.Peers
           expect(peers).to.exist
-          console.log(peers)
           expect(peers.length).to.be.above(1)
           done()
         })

test/http-api/inject/test-bootstrap.js

@@ -2,21 +2,32 @@
 'use strict'
 
 const expect = require('chai').expect
+const qs = require('qs')
+const defaultList = require('../../../src/init-files/default-config.json').Bootstrap
 
 module.exports = (http) => {
   describe('/bootstrap', () => {
+    const validIp4 = '/ip4/101.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z'
     let api
 
-    before(() => {
+    before((done) => {
       api = http.api.server.select('API')
+      api.inject({
+        method: 'GET',
+        url: '/api/v0/bootstrap/add',
+        payload: {
+          default: 'true'
+        }
+      }, () => done())
     })
 
     it('/list', (done) => {
       api.inject({
         method: 'GET',
         url: '/api/v0/bootstrap/list'
       }, (res) => {
-        expect(res.result).to.deep.equal(defaultList)
+        expect(res.statusCode).to.be.eql(200)
+        expect(res.result.Peers).to.deep.equal(defaultList)
         done()
       })
     })
@@ -26,54 +37,51 @@ module.exports = (http) => {
         method: 'GET',
         url: '/api/v0/bootstrap'
       }, (res) => {
-        expect(res.result).to.deep.equal(defaultList)
+        expect(res.statusCode).to.be.eql(200)
+        expect(res.result.Peers).to.deep.equal(defaultList)
         done()
       })
     })
 
-    it.skip('/add', (done) => { // TODO
+    it('/add', (done) => {
+      const query = {
+        arg: validIp4
+      }
+
       api.inject({
         method: 'GET',
-        url: '/api/v0/bootstrap/add',
-        payload: {
-          arg: '/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT'
-        }
+        url: `/api/v0/bootstrap/add?${qs.stringify(query)}`
       }, (res) => {
-        // TODO assess
+        expect(res.statusCode).to.be.eql(200)
+        expect(res.result.Peers).to.be.eql([validIp4])
+        done()
       })
     })
 
-    it.skip('/rm', (done) => { // TODO
+    it('/rm', (done) => {
+      const query = {
+        arg: validIp4
+      }
+
       api.inject({
         method: 'GET',
-        url: '/api/v0/bootstrap/rm',
-        payload: {
-          arg: '/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT'
-        }
+        url: `/api/v0/bootstrap/rm?${qs.stringify(query)}`
       }, (res) => {
-        // TODO assess
+        expect(res.statusCode).to.be.eql(200)
+        expect(res.result.Peers).to.be.eql([validIp4])
+        done()
       })
     })
 
-    it.skip('/list confirm it changed', (done) => { // TODO
+    it('/list confirm it changed', (done) => {
       api.inject({
         method: 'GET',
         url: '/api/v0/bootstrap/list'
       }, (res) => {
-        // TODO assess
+        expect(res.statusCode).to.be.eql(200)
+        expect(res.result.Peers).to.be.eql(defaultList)
+        done()
       })
     })
   })
 }
-
-const defaultList = [
-  '/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
-  '/ip4/104.236.176.52/tcp/4001/ipfs/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z',
-  '/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM',
-  '/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm',
-  '/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu',
-  '/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64',
-  '/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd',
-  '/ip4/178.62.61.185/tcp/4001/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3',
-  '/ip4/104.236.151.122/tcp/4001/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx'
-]