refactor(tests): avoid having a tasks folder (legacy of pre-aegir) and clean up the tests folder to make the organization more obvious

Author: daviddias

.gitignore

@@ -1,6 +1,6 @@
 node_modules
 *.log
-test/tmp-disposable-nodes-addrs.json
+test/setup/tmp-disposable-nodes-addrs.json
 dist
 lib
-coverage
+coverage

gulpfile.js

@@ -2,5 +2,11 @@
 
 const gulp = require('gulp')
 
-require('./tasks/test')
+require('./test/setup/spawn-daemons')
+
+gulp.task('test:node:before', ['daemons:start'])
+gulp.task('test:node:after', ['daemons:stop'])
+gulp.task('test:browser:before', ['daemons:start'])
+gulp.task('test:browser:after', ['daemons:stop'])
+
 require('aegir/gulp')(gulp)

tasks/test.js

@@ -1,3 +1,3 @@
 'use strict'
 
-require('./setup')
+require('./setup/setup-ipfs-api-clients')

test/browser.js

@@ -65,7 +65,7 @@ describe('.config', () => {
       return done()
     }
 
-    apiClients.c.config.replace(path.join(__dirname, '/../r-config.json'), (err, res) => {
+    apiClients.c.config.replace(path.join(__dirname, '/../data/r-config.json'), (err, res) => {
       expect(err).to.not.exist
       expect(res).to.be.equal(null)
       done()
@@ -126,7 +126,7 @@ describe('.config', () => {
         return
       }
 
-      return apiClients.c.config.replace(path.join(__dirname, '/../r-config.json'))
+      return apiClients.c.config.replace(path.join(__dirname, '/../data/r-config.json'))
         .then((res) => {
           expect(res).to.be.equal(null)
         })

test/15mb.random renamed to test/data/15mb.random

@@ -7,10 +7,9 @@ const expect = require('chai').expect
 const isNode = require('detect-node')
 const path = require('path')
 const test = require('interface-ipfs-core')
+const fs = require('fs')
 
-let testfile
-
-testfile = require('fs').readFileSync(path.join(__dirname, '/../testfile.txt'))
+const testfile = fs.readFileSync(path.join(__dirname, '/../data/testfile.txt'))
 
 // Load the add/cat/get/ls commands from interface-ipfs-core
 const common = {

test/r-config.json renamed to test/data/r-config.json

@@ -7,21 +7,17 @@
 const expect = require('chai').expect
 const isNode = require('detect-node')
 const fs = require('fs')
-// const bl = require('bl')
 const concat = require('concat-stream')
 const through = require('through2')
 const streamEqual = require('stream-equal')
-
 const path = require('path')
 
-// const extract = require('tar-stream').extract
-
-const testfile = fs.readFileSync(path.join(__dirname, '/../testfile.txt'))
+const testfile = fs.readFileSync(path.join(__dirname, '/../data/testfile.txt'))
 
 let testfileBig
 
 if (isNode) {
-  const tfbPath = path.join(__dirname, '/../15mb.random')
+  const tfbPath = path.join(__dirname, '/../data/15mb.random')
   testfileBig = fs.createReadStream(tfbPath, { bufferSize: 128 })
 }
 

test/test-folder/add.js renamed to test/data/test-folder/add.js

@@ -10,6 +10,14 @@ const common = {
     let c = 0
     cb(null, {
       spawnNode: (path, config, callback) => {
+        if (typeof path === 'function') {
+          callback = path
+          path = undefined
+        }
+        if (typeof config === 'function') {
+          callback = config
+          config = undefined
+        }
         switch (c) {
           case 0: callback(null, apiClients.a); c++; break
           case 1: callback(null, apiClients.b); c++; break

test/test-folder/cat.js renamed to test/data/test-folder/cat.js

@@ -3,11 +3,11 @@
 
 const expect = require('chai').expect
 
-const ipfsAPI = require('../src/index.js')
+const ipfsAPI = require('./../../src/index.js')
 
 describe('ipfsAPI constructor tests', () => {
   describe('parameter permuations', () => {
-    const apiAddrs = require('./tmp-disposable-nodes-addrs.json')
+    const apiAddrs = require('./../setup/tmp-disposable-nodes-addrs.json')
     const apiAddr = apiAddrs.a.split('/')
 
     function clientWorks (client, done) {

test/test-folder/files/hello.txt renamed to test/data/test-folder/files/hello.txt

@@ -3,12 +3,12 @@
 
 const expect = require('chai').expect
 const isNode = require('detect-node')
-const ipfsAPI = require('../src/index.js')
+const ipfsAPI = require('./../../src/index.js')
 const noop = () => {}
 
 describe('ipfsAPI request tests', () => {
   describe('requestAPI', () => {
-    const apiAddrs = require('./tmp-disposable-nodes-addrs.json')
+    const apiAddrs = require('./../setup/tmp-disposable-nodes-addrs.json')
     const apiAddr = apiAddrs.a.split('/')
 
     it('excludes port from URL if config.port is falsy', (done) => {
@@ -57,7 +57,7 @@ describe('ipfsAPI request tests', () => {
         res.end()
       }).listen(6001, () => {
         ipfsAPI('/ip4/127.0.0.1/tcp/6001')
-          .config.replace('test/r-config.json', (err) => {
+          .config.replace('test/data/r-config.json', (err) => {
             expect(err).to.not.exist
             server.close(done)
           })

test/test-folder/files/ipfs.txt renamed to test/data/test-folder/files/ipfs.txt

@@ -1,3 +1,3 @@
 'use strict'
 
-require('./setup')
+require('./setup/setup-ipfs-api-clients')

test/test-folder/hello-link renamed to test/data/test-folder/hello-link

@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const ipfsAPI = require('../src/index.js')
+const ipfsAPI = require('./../../src/index.js')
 const apiAddrs = require('./tmp-disposable-nodes-addrs.json')
 
 // a, b, c

test/test-folder/ipfs-add.js renamed to test/data/test-folder/ipfs-add.js

@@ -1,5 +1,6 @@
 'use strict'
-/* eslint max-nested-callbacks: ["error", 8] */ // TODO reduce nesteness
+// TODO reduce the callbacks nestness
+/* eslint max-nested-callbacks: ["error", 8] */
 
 const gulp = require('gulp')
 const fs = require('fs')
@@ -21,7 +22,7 @@ function startDisposableDaemons (callback) {
   function finish () {
     counter++
     if (counter === 3) {
-      const targetPath = path.join(__dirname, '/../test/tmp-disposable-nodes-addrs.json')
+      const targetPath = path.join(__dirname, '/tmp-disposable-nodes-addrs.json')
       fs.writeFileSync(targetPath, JSON.stringify(apiAddrs))
       callback(ipfsNodes)
     }