test: refactor for test sanity (#733)

Author: daviddias

.aegir.js

@@ -10,4 +10,3 @@ module.exports = {
     }]
   }
 }
-

package.json

@@ -10,7 +10,7 @@
     "libp2p-ipfs-nodejs": "libp2p-ipfs-browser",
     "./src/core/default-repo.js": "./src/core/default-repo-browser.js",
     "./src/core/components/init-assets.js": false,
-    "./test/utils/temp-repo.js": "./test/utils/temp-repo-browser.js",
+    "./test/utils/create-repo-node.js": "./test/utils/create-repo-browser.js",
     "stream": "readable-stream"
   },
   "go-ipfs": {
@@ -170,4 +170,4 @@
     "nginnever <[email protected]>",
     "npmcdn-to-unpkg-bot <[email protected]>"
   ]
-}
+}

test/browser.js

@@ -16,7 +16,11 @@ const API = require('ipfs-api')
 const multiaddr = require('multiaddr')
 const isNode = require('detect-node')
 
-const IPFS = require('../../../src/core')
+// This gets replaced by require('../utils/create-repo-browser.js')
+// in the browser
+const createTempRepo = require('../utils/create-repo-node.js')
+
+const IPFS = require('../../src/core')
 
 function makeBlock (cb) {
   return cb(null, new Block(`IPFS is awesome ${Math.random()}`))
@@ -27,19 +31,24 @@ describe('bitswap', () => {
   let swarmAddrsBak
 
   beforeEach((done) => {
-    inProcNode = new IPFS(require('../../utils/repo-path'))
-    if (!isNode) {
-      inProcNode.config.get('Addresses.Swarm', (err, swarmAddrs) => {
-        expect(err).to.not.exist
-        swarmAddrsBak = swarmAddrs
-        inProcNode.config.set('Addresses.Swarm', [], (err) => {
-          expect(err).to.not.exist
-          inProcNode.load(done)
-        })
-      })
-    } else {
-      inProcNode.load(done)
-    }
+    const repo = createTempRepo()
+    inProcNode = new IPFS(repo)
+    series([
+      (cb) => inProcNode.init({ bits: 2048 }, cb),
+      (cb) => {
+        if (!isNode) {
+          inProcNode.config.get('Addresses.Swarm', (err, swarmAddrs) => {
+            expect(err).to.not.exist
+            swarmAddrsBak = swarmAddrs
+            inProcNode.config.set('Addresses.Swarm', [], cb)
+          })
+        } else {
+          cb()
+        }
+      },
+      (cb) => inProcNode.config.set('Discovery.MDNS.Enabled', false, cb),
+      (cb) => inProcNode.load(cb)
+    ], done)
   })
 
   afterEach((done) => {

test/core/both/test-bitswap.js renamed to test/core/bitswap.spec.js

@@ -2,15 +2,27 @@
 'use strict'
 
 const expect = require('chai').expect
+const isNode = require('detect-node')
+const series = require('async/series')
 
-const IPFS = require('../../../src/core')
+// This gets replaced by require('../utils/create-repo-browser.js')
+// in the browser
+const createTempRepo = require('../utils/create-repo-node.js')
+
+const IPFS = require('../../src/core')
 
 describe('bootstrap', () => {
-  var ipfs
+  if (!isNode) { return }
+
+  let ipfs
 
   before((done) => {
-    ipfs = new IPFS(require('../../utils/repo-path'))
-    ipfs.load(done)
+    const repo = createTempRepo()
+    ipfs = new IPFS(repo)
+    series([
+      (cb) => ipfs.init({ bits: 1024 }, cb),
+      (cb) => ipfs.load(cb)
+    ], done)
   })
 
   const defaultList = [