fix: use new ipfsd-ctl setup

Author: hugomrdias

package.json

@@ -103,7 +103,7 @@
     "through2": "^3.0.1"
   },
   "devDependencies": {
-    "aegir": "^20.3.1",
+    "aegir": "^20.3.2",
     "browser-process-platform": "~0.1.1",
     "cross-env": "^6.0.0",
     "go-ipfs-dep": "^0.4.22",

test/interface.spec.js

@@ -2,47 +2,29 @@
 'use strict'
 
 const tests = require('interface-ipfs-core')
-const isNode = require('detect-node')
-const CommonFactory = require('./utils/interface-common-factory')
+const merge = require('merge-options')
+const { isNode } = require('ipfs-utils/src/env')
+const ctl = require('ipfsd-ctl')
 const isWindows = process.platform && process.platform === 'win32'
 
 describe('interface-ipfs-core tests', () => {
-  const defaultCommonFactory = CommonFactory.create()
+  const commonOptions = {
+    factoryOptions: { IpfsClient: require('../src') }
+  }
+  const commonFactory = ctl.createTestsInterface(commonOptions)
 
-  tests.bitswap(defaultCommonFactory, {
-    skip: [
-      // bitswap.stat
-      {
-        name: 'should not get bitswap stats when offline',
-        reason: 'FIXME go-ipfs returns an error https://github.com/ipfs/go-ipfs/issues/4078'
-      },
-      // bitswap.wantlist
-      {
-        name: 'should not get the wantlist when offline',
-        reason: 'FIXME go-ipfs returns an error https://github.com/ipfs/go-ipfs/issues/4078'
-      },
-      // bitswap.unwant
-      {
-        name: 'should remove a key from the wantlist',
-        reason: 'FIXME why is this skipped?'
-      },
-      {
-        name: 'should not remove a key from the wantlist when offline',
-        reason: 'FIXME go-ipfs returns an error https://github.com/ipfs/go-ipfs/issues/4078'
-      }
-    ]
-  })
+  tests.bitswap(commonFactory)
 
-  tests.block(defaultCommonFactory, {
+  tests.block(commonFactory, {
     skip: [{
       name: 'should get a block added as CIDv1 with a CIDv0',
       reason: 'go-ipfs does not support the `version` param'
     }]
   })
 
-  tests.bootstrap(defaultCommonFactory)
+  tests.bootstrap(commonFactory)
 
-  tests.config(defaultCommonFactory, {
+  tests.config(commonFactory, {
     skip: [
       // config.replace
       {
@@ -60,7 +42,7 @@ describe('interface-ipfs-core tests', () => {
     ]
   })
 
-  tests.dag(defaultCommonFactory, {
+  tests.dag(commonFactory, {
     skip: [
       // dag.tree
       {
@@ -87,7 +69,7 @@ describe('interface-ipfs-core tests', () => {
     ]
   })
 
-  tests.dht(defaultCommonFactory, {
+  tests.dht(commonFactory, {
     skip: [
       // dht.findpeer
       {
@@ -107,47 +89,47 @@ describe('interface-ipfs-core tests', () => {
     ]
   })
 
-  tests.filesRegular(defaultCommonFactory, {
+  tests.filesMFS(commonFactory, {
     skip: [
-      // .addFromFs
-      isNode ? null : {
-        name: 'addFromFs',
-        reason: 'Not designed to run in the browser'
-      },
-      // .catPullStream
       {
-        name: 'should export a chunk of a file',
-        reason: 'TODO not implemented in go-ipfs yet'
+        name: 'should ls directory with long option',
+        reason: 'TODO unskip when go-ipfs supports --long https://github.com/ipfs/go-ipfs/pull/6528'
       },
       {
-        name: 'should export a chunk of a file in a Pull Stream',
+        name: 'should read from outside of mfs',
         reason: 'TODO not implemented in go-ipfs yet'
       },
       {
-        name: 'should export a chunk of a file in a Readable Stream',
+        name: 'should ls from outside of mfs',
         reason: 'TODO not implemented in go-ipfs yet'
       }
     ]
   })
 
-  tests.filesMFS(defaultCommonFactory, {
+  tests.filesRegular(commonFactory, {
     skip: [
+      // .addFromFs
+      isNode ? null : {
+        name: 'addFromFs',
+        reason: 'Not designed to run in the browser'
+      },
+      // .catPullStream
       {
-        name: 'should ls directory with long option',
-        reason: 'TODO unskip when go-ipfs supports --long https://github.com/ipfs/go-ipfs/pull/6528'
+        name: 'should export a chunk of a file',
+        reason: 'TODO not implemented in go-ipfs yet'
       },
       {
-        name: 'should read from outside of mfs',
+        name: 'should export a chunk of a file in a Pull Stream',
         reason: 'TODO not implemented in go-ipfs yet'
       },
       {
-        name: 'should ls from outside of mfs',
+        name: 'should export a chunk of a file in a Readable Stream',
         reason: 'TODO not implemented in go-ipfs yet'
       }
     ]
   })
 
-  tests.key(defaultCommonFactory, {
+  tests.key(commonFactory, {
     skip: [
       // key.export
       {
@@ -162,7 +144,7 @@ describe('interface-ipfs-core tests', () => {
     ]
   })
 
-  tests.miscellaneous(defaultCommonFactory, {
+  tests.miscellaneous(commonFactory, {
     skip: [
       // stop
       {
@@ -172,19 +154,21 @@ describe('interface-ipfs-core tests', () => {
     ]
   })
 
-  tests.name(CommonFactory.create({
-    spawnOptions: {
-      args: ['--offline']
+  tests.name(ctl.createTestsInterface(merge(commonOptions,
+    {
+      spawnOptions: {
+        args: ['--offline']
+      }
     }
-  }))
+  )))
 
-  // TODO: uncomment after https://github.com/ipfs/interface-ipfs-core/pull/361 being merged and a new release
-  tests.namePubsub(CommonFactory.create({
-    spawnOptions: {
-      args: ['--enable-namesys-pubsub'],
-      initOptions: { bits: 1024, profile: 'test' }
+  tests.namePubsub(ctl.createTestsInterface(merge(commonOptions,
+    {
+      spawnOptions: {
+        args: ['--enable-namesys-pubsub']
+      }
     }
-  }), {
+  )), {
     skip: [
       // name.pubsub.cancel
       {
@@ -199,11 +183,11 @@ describe('interface-ipfs-core tests', () => {
     ]
   })
 
-  tests.object(defaultCommonFactory)
+  tests.object(commonFactory)
 
-  tests.pin(defaultCommonFactory)
+  tests.pin(commonFactory)
 
-  tests.ping(defaultCommonFactory, {
+  tests.ping(commonFactory, {
     skip: [
       {
         name: 'should fail when pinging an unknown peer over pull stream',
@@ -220,12 +204,13 @@ describe('interface-ipfs-core tests', () => {
     ]
   })
 
-  tests.pubsub(CommonFactory.create({
-    spawnOptions: {
-      args: ['--enable-pubsub-experiment'],
-      initOptions: { bits: 1024, profile: 'test' }
+  tests.pubsub(ctl.createTestsInterface(merge(commonOptions,
+    {
+      spawnOptions: {
+        args: ['--enable-pubsub-experiment']
+      }
     }
-  }), {
+  )), {
     skip: isWindows ? [
       // pubsub.subscribe
       {
@@ -239,9 +224,9 @@ describe('interface-ipfs-core tests', () => {
     ] : null
   })
 
-  tests.repo(defaultCommonFactory)
+  tests.repo(commonFactory)
 
-  tests.stats(defaultCommonFactory)
+  tests.stats(commonFactory)
 
-  tests.swarm(CommonFactory.createAsync())
+  tests.swarm(commonFactory)
 })