updating tests cases

Author: grantlouisherman

src/http/index.js

@@ -109,24 +109,24 @@ class HttpApi {
 
     const apiAddrs = config.Addresses.API
 
-    this._apiServers = await Promise.resolve(
+    this._apiServer = await Promise.resolve(
       serverCreator.apply(this, [apiAddrs, this._createApiServer, hapiInfoToMultiaddr, ipfs])
     )
     // for the CLI to know the where abouts of the API
-    await promisify(ipfs._repo.apiAddr.set)(this._apiServers[0].info.ma)
+    await promisify(ipfs._repo.apiAddr.set)(this._apiServer[0].info.ma)
 
     const gatewayAddr = config.Addresses.Gateway
 
     this._gatewayServer = await Promise.resolve(
       serverCreator.apply(this, [gatewayAddr, this._createGatewayServer, hapiInfoToMultiaddr, ipfs])
     )
-    this._apiServers.forEach(apiServer => {
+    this._apiServer.forEach(apiServer => {
       ipfs._print('API listening on %s', apiServer.info.ma)
     })
     this._gatewayServer.forEach(gatewayServer => {
       ipfs._print('Gateway (read only) listening on %s', gatewayServer.info.ma)
     })
-    this._apiServers.forEach(apiServer => {
+    this._apiServer.forEach(apiServer => {
       ipfs._print('Web UI available at %s', toUri(apiServer.info.ma) + '/webui')
     })
     this._log('started')
@@ -199,7 +199,7 @@ class HttpApi {
 
   get apiAddr () {
     if (!this._apiServer) throw new Error('API address unavailable - server is not started')
-    return multiaddr('/ip4/127.0.0.1/tcp/' + this._apiServers[0].info.port)
+    return multiaddr('/ip4/127.0.0.1/tcp/' + this._apiServer[0].info.port)
   }
 
   async stop () {

test/gateway/index.js

@@ -60,7 +60,7 @@ describe('HTTP Gateway', function () {
 
     await http.api.start()
 
-    gateway = http.api._gatewayServer
+    gateway = http.api._gatewayServer[0]
 
     // QmbQD7EMEL1zeebwBsWEfA3ndgSS6F7S6iTuwuqasPgVRi
     await http.api._ipfs.add([

test/http-api/inject/bitswap.js

@@ -12,7 +12,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
     })
 
     before(async function () {

test/http-api/inject/block.js

@@ -13,7 +13,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
     })
 
     describe('/block/put', () => {

test/http-api/inject/bootstrap.js

@@ -11,7 +11,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
       return api.inject({
         method: 'GET',
         url: '/api/v0/bootstrap/add/default'

test/http-api/inject/config.js

@@ -17,7 +17,7 @@ module.exports = (http) => {
 
     before(() => {
       updatedConfig = () => JSON.parse(fs.readFileSync(configPath, 'utf8'))
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
     })
 
     after(() => {

test/http-api/inject/dht.js

@@ -10,8 +10,9 @@ chai.use(dirtyChai)
 module.exports = (http) => {
   describe('/dht', () => {
     let api
+
     before(() => {
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
     })
 
     describe('/findpeer', () => {
@@ -20,6 +21,7 @@ module.exports = (http) => {
           method: 'GET',
           url: `/api/v0/dht/findpeer`
         })
+
         expect(res.statusCode).to.equal(400)
         expect(res.result.Code).to.be.eql(1)
       })

test/http-api/inject/dns.js

@@ -8,7 +8,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
     })
 
     it('resolve ipfs.io dns', async () => {

test/http-api/inject/files.js

@@ -13,7 +13,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
     })
 
     describe('/add', () => {

test/http-api/inject/id.js

@@ -8,7 +8,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
     })
 
     it('get the id', async () => {

test/http-api/inject/name.js

@@ -16,7 +16,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
     })
 
     it('should publish a record', async function () {

test/http-api/inject/object.js

@@ -17,7 +17,7 @@ module.exports = (http) => {
     let api
 
     before('api', () => {
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
     })
 
     describe('/new', () => {

test/http-api/inject/pin.js

@@ -37,7 +37,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
     })
 
     describe('rm', () => {

test/http-api/inject/ping.js

@@ -13,7 +13,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
     })
 
     it('returns 400 if both n and count are provided', async () => {

test/http-api/inject/pubsub.js

@@ -16,7 +16,7 @@ module.exports = (http) => {
     const topicNotSubscribed = 'somethingRandom'
 
     before(() => {
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
     })
 
     describe('/sub', () => {

test/http-api/inject/resolve.js

@@ -12,7 +12,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
     })
 
     it('should resolve a path and return a base2 encoded CID', async () => {

test/http-api/inject/version.js

@@ -9,7 +9,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer
+      api = http.api._apiServer[0]
     })
 
     it('get the version', async () => {