Make pubsub tests runnable within normal test suite

Author: victorb

src/api/pubsub.js

@@ -4,7 +4,6 @@ const promisify = require('promisify-es6')
 const bs58 = require('bs58')
 var Base64 = require('js-base64').Base64
 var Stream = require('stream')
-// const Wreck = require('wreck')
 var http = require('http')
 
 let activeSubscriptions = []
@@ -22,8 +21,8 @@ const addSubscription = (subscriptions, topic) => {
   return subscriptions.concat([topic])
 }
 
-module.exports = (send) => {
-  const api = {
+module.exports = (send, config) => {
+  return {
     sub: promisify((topic, options, callback) => {
       if (typeof options === 'function') {
         callback = options
@@ -42,10 +41,12 @@ module.exports = (send) => {
         return callback(new Error('Already subscribed to ' + topic), null)
       }
 
-      // we're using http.get here to have more control
+      // we're using http.get here to have more control over the request
+      // and avoid refactoring of the request-api where wreck is gonna be
+      // replaced by fetch (https://github.com/ipfs/js-ipfs-api/pull/355)
       const request = http.get({
-        host: 'localhost',
-        port: 5001,
+        host: config.host,
+        port: config.port,
         path: '/api/v0/pubsub/sub/' + topic
       }, function (response) {
         response.on('data', function (d) {
@@ -101,6 +102,4 @@ module.exports = (send) => {
       })
     })
   }
-
-  return api
 }

src/index.js

@@ -36,7 +36,7 @@ function IpfsAPI (hostOrMultiaddr, port, opts) {
   }
 
   const requestAPI = getRequestAPI(config)
-  const cmds = loadCommands(requestAPI)
+  const cmds = loadCommands(requestAPI, config)
   cmds.send = requestAPI
   cmds.Buffer = Buffer
 

src/load-commands.js

@@ -58,12 +58,12 @@ function requireCommands () {
   return cmds
 }
 
-function loadCommands (send) {
+function loadCommands (send, config) {
   const files = requireCommands()
   const cmds = {}
 
   Object.keys(files).forEach((file) => {
-    cmds[file] = files[file](send)
+    cmds[file] = files[file](send, config)
   })
 
   return cmds

test.js

@@ -52,25 +52,6 @@ function Factory () {
   }
 }
 
-function spawnLocalNode (callback) {
-  console.log("Spawn local node")
-  ipfsd.local((err, node) => {
-    if (err) {
-      return callback(err)
-    }
-
-  console.log("start daemon")
-    node.startDaemon((err, ipfs) => {
-  console.log("started")
-      if (err) {
-        return callback(err)
-      }
-
-      callback(null, node)
-    })
-  })
-}
-
 function spawnEphemeralNode (callback) {
   ipfsd.disposable((err, node) => {
     if (err) {

test/factory/daemon-spawner.js

@@ -5,9 +5,6 @@
 const expect = require('chai').expect
 const isNode = require('detect-node')
 const FactoryClient = require('../factory/factory-client')
-const ipfsApi = require('../../src')
-
-const useLocalDaemon = true
 
 const topicName = 'js-ipfs-api-tests'
 
@@ -28,20 +25,18 @@ describe('.pubsub', () => {
   let fc
 
   before(function (done) {
-    this.timeout(20 * 1000) // slow CI
-    // fc = new FactoryClient()
-    // fc.spawnNode(null, null, useLocalDaemon, (err, node) => {
-    //   console.log("aaaa", err, node)
-    //   expect(err).to.not.exist
-    //   if(err) done(err)
-      ipfs = ipfsApi()
+    fc = new FactoryClient()
+    fc.spawnNode((err, node) => {
+      expect(err).to.not.exist
+      if (err) done(err)
+      ipfs = node
       done()
-    // })
+    })
   })
 
-  // after((done) => {
-  //   // fc.dismantle(done)
-  // })
+  after((done) => {
+    fc.dismantle(done)
+  })
 
   describe('.publish', () => {
     it('message from string', (done) => {