last updates

Author: dignifiedquire

src/pubsub.js

@@ -55,7 +55,7 @@ function makeCheck (n, done) {
 }
 
 module.exports = (common) => {
-  describe.only('.pubsub', () => {
+  describe('.pubsub', () => {
     const topic = 'pubsub-tests'
 
     describe('callback API', () => {
@@ -303,17 +303,24 @@ module.exports = (common) => {
           })
 
           it('list with 3 subscribed topics', (done) => {
-            const topics = ['one', 'two', 'three'].map((t) => ({
-              name: t,
-              handler (msg) {}
-            }))
+            const topics = [{
+              name: 'one',
+              handler () {}
+            }, {
+              name: 'two',
+              handler () {}
+            }, {
+              name: 'three',
+              handler () {}
+            }]
 
             each(topics, (t, cb) => {
               ipfs1.pubsub.subscribe(t.name, t.handler, cb)
             }, (err) => {
               expect(err).to.not.exist
               ipfs1.pubsub.ls((err, list) => {
                 expect(err).to.not.exist
+
                 expect(
                   list.sort()
                 ).to.be.eql(
@@ -322,7 +329,6 @@ module.exports = (common) => {
 
                 topics.forEach((t) => {
                   ipfs1.pubsub.unsubscribe(t.name, t.handler)
-                  ipfs2.pubsub.unsubscribe(t.name, t.handler)
                 })
 
                 done()
@@ -531,18 +537,14 @@ module.exports = (common) => {
         common.teardown(done)
       })
 
-      it('.subscribe and .publish', (done) => {
-        const check = makeCheck(2, done)
-
+      it('.subscribe and .publish', () => {
         const sub = (msg) => {
           expect(msg.data.toString()).to.be.eql('hi')
           ipfs1.pubsub.unsubscribe(topic, sub)
-          check()
         }
 
-        ipfs1.pubsub.subscribe(topic, sub)
+        return ipfs1.pubsub.subscribe(topic, sub)
           .then(() => ipfs1.pubsub.publish(topic, 'hi'))
-          .then(check, check)
       })
 
       it('.peers', () => {