fix: support new ctl

ipfs-inactive · Dec 10, 2019 · 12bbf34 · 12bbf34
1 parent 73732a0
commit 12bbf34
Show file tree

Hide file tree

Showing 14 changed files with 57 additions and 189 deletions.
diff --git a/package.json b/package.json
@@ -84,8 +84,8 @@
     "cross-env": "^6.0.0",
     "detect-node": "^2.0.4",
     "go-ipfs-dep": "^0.4.22",
-    "interface-ipfs-core": "ipfs/interface-js-ipfs-core#feat/interface-tests",
-    "ipfsd-ctl": "ipfs/js-ipfsd-ctl#feat/interface-tests",
+    "interface-ipfs-core": "github:ipfs/interface-js-ipfs-core#feat/interface-tests",
+    "ipfsd-ctl": "github:ipfs/js-ipfsd-ctl#feat/interface-tests",
     "ndjson": "^1.5.0",
     "nock": "^11.4.0",
     "pull-stream": "^3.6.14",

diff --git a/test/commands.spec.js b/test/commands.spec.js
@@ -2,30 +2,18 @@
 'use strict'
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
-const ipfsClient = require('../src')
 const f = require('./utils/factory')
 
 describe('.commands', function () {
   this.timeout(60 * 1000)
 
-  let ipfsd
   let ipfs
 
   before(async () => {
-    ipfsd = await f.spawn({
-      initOptions: {
-        bits: 1024,
-        profile: 'test'
-      }
-    })
-    ipfs = ipfsClient(ipfsd.apiAddr)
+    ipfs = await f.setup()
   })
 
-  after(async () => {
-    if (ipfsd) {
-      await ipfsd.stop()
-    }
-  })
+  after(() => f.teardown())
 
   it('lists commands', async () => {
     const res = await ipfs.commands()

diff --git a/test/constructor.spec.js b/test/constructor.spec.js
@@ -93,24 +93,18 @@ describe('ipfs-http-client constructor tests', () => {
   })
 
   describe('integration', () => {
-    let apiAddr
     let ipfsd
 
     before(async function () {
       this.timeout(60 * 1000) // slow CI
 
-      ipfsd = await f.spawn({ initOptions: { bits: 1024, profile: 'test' } })
-      apiAddr = ipfsd.apiAddr.toString()
+      ipfsd = await f.node()
     })
 
-    after(async () => {
-      if (ipfsd) {
-        await ipfsd.stop()
-      }
-    })
+    after(() => ipfsd.stop())
 
     it('can connect to an ipfs http api', async () => {
-      await clientWorks(ipfsClient(apiAddr))
+      await clientWorks(ipfsClient(ipfsd.apiAddr))
     })
   })
 })

diff --git a/test/dag.spec.js b/test/dag.spec.js
@@ -6,29 +6,17 @@
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const { DAGNode } = require('ipld-dag-pb')
 const CID = require('cids')
-const ipfsClient = require('../src')
 const f = require('./utils/factory')
 
-let ipfsd
 let ipfs
 
 describe('.dag', function () {
   this.timeout(20 * 1000)
   before(async function () {
-    ipfsd = await f.spawn({
-      initOptions: {
-        bits: 1024,
-        profile: 'test'
-      }
-    })
-    ipfs = ipfsClient(ipfsd.apiAddr)
+    ipfs = await f.setup()
   })
 
-  after(async () => {
-    if (ipfsd) {
-      await ipfsd.stop()
-    }
-  })
+  after(() => f.teardown())
 
   it('should be able to put and get a DAG node with format dag-pb', async () => {
     const data = Buffer.from('some data')

diff --git a/test/diag.spec.js b/test/diag.spec.js
@@ -3,7 +3,6 @@
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const platform = require('browser-process-platform')
-const ipfsClient = require('../src')
 const f = require('./utils/factory')
 
 describe('.diag', function () {
@@ -12,24 +11,13 @@ describe('.diag', function () {
   // go-ipfs does not support these on Windows
   if (platform === 'win32') { return }
 
-  let ipfsd
   let ipfs
 
   before(async () => {
-    ipfsd = await f.spawn({
-      initOptions: {
-        bits: 1024,
-        profile: 'test'
-      }
-    })
-    ipfs = ipfsClient(ipfsd.apiAddr)
+    ipfs = await f.setup()
   })
 
-  after(async () => {
-    if (ipfsd) {
-      await ipfsd.stop()
-    }
-  })
+  after(() => f.teardown())
 
   describe('api API', () => {
     // Disabled in go-ipfs 0.4.10

diff --git a/test/files-mfs.spec.js b/test/files-mfs.spec.js
@@ -10,7 +10,6 @@ const values = require('pull-stream/sources/values')
 const pull = require('pull-stream/pull')
 const collect = require('pull-stream/sinks/collect')
 
-const ipfsClient = require('../src')
 const f = require('./utils/factory')
 const expectTimeout = require('./utils/expect-timeout')
 
@@ -31,26 +30,15 @@ const HASH_ALGS = [
 describe('.files (the MFS API part)', function () {
   this.timeout(20 * 1000)
 
-  let ipfsd
   let ipfs
 
   const expectedMultihash = 'Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP'
 
   before(async () => {
-    ipfsd = await f.spawn({
-      initOptions: {
-        bits: 1024,
-        profile: 'test'
-      }
-    })
-    ipfs = ipfsClient(ipfsd.apiAddr)
+    ipfs = await f.setup()
   })
 
-  after(async () => {
-    if (ipfsd) {
-      await ipfsd.stop()
-    }
-  })
+  after(() => f.teardown())
 
   it('.add file for testing', async () => {
     const res = await ipfs.add(testfile)

diff --git a/test/get.spec.js b/test/get.spec.js
@@ -6,7 +6,6 @@
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const loadFixture = require('aegir/fixtures')
 
-const ipfsClient = require('../src')
 const f = require('./utils/factory')
 
 describe('.get (specific go-ipfs features)', function () {
@@ -21,26 +20,14 @@ describe('.get (specific go-ipfs features)', function () {
     data: fixture('test/fixtures/testfile.txt')
   }
 
-  let ipfsd
   let ipfs
 
   before(async () => {
-    ipfsd = await f.spawn({
-      initOptions: {
-        bits: 1024,
-        profile: 'test'
-      }
-    })
-    ipfs = ipfsClient(ipfsd.apiAddr)
-
+    ipfs = await f.setup()
     await ipfs.add(smallFile.data)
   })
 
-  after(async () => {
-    if (ipfsd) {
-      await ipfsd.stop()
-    }
-  })
+  after(() => f.teardown())
 
   it('no compression args', async () => {
     const files = await ipfs.get(smallFile.cid)

diff --git a/test/interface.spec.js b/test/interface.spec.js
@@ -4,14 +4,20 @@
 const tests = require('interface-ipfs-core')
 const merge = require('merge-options')
 const { isNode } = require('ipfs-utils/src/env')
-const ctl = require('ipfsd-ctl')
+const { createTestsInterface } = require('ipfsd-ctl')
 const isWindows = process.platform && process.platform === 'win32'
 
 describe('interface-ipfs-core tests', () => {
   const commonOptions = {
-    factoryOptions: { IpfsClient: require('../src') }
+    ipfsHttp: {
+      path: require.resolve('../src'),
+      ref: require('../src')
+    },
+    ipfsOptions: {
+      pass: 'ipfs-is-awesome-software'
+    }
   }
-  const commonFactory = ctl.createTestsInterface(commonOptions)
+  const commonFactory = createTestsInterface(commonOptions)
 
   tests.bitswap(commonFactory)
 
@@ -144,20 +150,12 @@ describe('interface-ipfs-core tests', () => {
     ]
   })
 
-  tests.miscellaneous(commonFactory, {
-    skip: [
-      // stop
-      {
-        name: 'should stop the node',
-        reason: 'FIXME go-ipfs returns an error https://github.com/ipfs/go-ipfs/issues/4078'
-      }
-    ]
-  })
+  tests.miscellaneous(commonFactory)
 
-  tests.name(ctl.createTestsInterface(merge(commonOptions,
+  tests.name(createTestsInterface(merge(commonOptions,
     {
-      spawnOptions: {
-        args: ['--offline']
+      ipfsOptions: {
+        offline: true
       }
     }
   )), {
@@ -170,10 +168,12 @@ describe('interface-ipfs-core tests', () => {
     ]
   })
 
-  tests.namePubsub(ctl.createTestsInterface(merge(commonOptions,
+  tests.namePubsub(createTestsInterface(merge(commonOptions,
     {
-      spawnOptions: {
-        args: ['--enable-namesys-pubsub']
+      ipfsOptions: {
+        EXPERIMENTAL: {
+          ipnsPubsub: true
+        }
       }
     }
   )), {
@@ -212,11 +212,9 @@ describe('interface-ipfs-core tests', () => {
     ]
   })
 
-  tests.pubsub(ctl.createTestsInterface(merge(commonOptions,
+  tests.pubsub(createTestsInterface(merge(commonOptions,
     {
-      spawnOptions: {
-        args: ['--enable-pubsub-experiment']
-      }
+      args: ['--enable-pubsub-experiment']
     }
   )), {
     skip: isWindows ? [

diff --git a/test/key.spec.js b/test/key.spec.js
@@ -3,30 +3,18 @@
 'use strict'
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
-const ipfsClient = require('../src')
 const f = require('./utils/factory')
 
 describe('.key', function () {
   this.timeout(50 * 1000)
 
-  let ipfsd
   let ipfs
 
   before(async () => {
-    ipfsd = await f.spawn({
-      initOptions: {
-        bits: 1024,
-        profile: 'test'
-      }
-    })
-    ipfs = ipfsClient(ipfsd.apiAddr)
+    ipfs = await f.setup()
   })
 
-  after(async () => {
-    if (ipfsd) {
-      await ipfsd.stop()
-    }
-  })
+  after(() => f.teardown())
 
   describe('.gen', () => {
     it('create a new rsa key', async () => {

diff --git a/test/log.spec.js b/test/log.spec.js
@@ -3,30 +3,18 @@
 'use strict'
 
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
-const ipfsClient = require('../src')
 const f = require('./utils/factory')
 
 describe('.log', function () {
   this.timeout(100 * 1000)
 
-  let ipfsd
   let ipfs
 
   before(async () => {
-    ipfsd = await f.spawn({
-      initOptions: {
-        bits: 1024,
-        profile: 'test'
-      }
-    })
-    ipfs = ipfsClient(ipfsd.apiAddr)
+    ipfs = await f.setup()
   })
 
-  after(async () => {
-    if (ipfsd) {
-      await ipfsd.stop()
-    }
-  })
+  after(() => f.teardown())
 
   it('.log.tail', async () => {
     const i = setInterval(async () => {