Merge pull request #355 from ipfs/fix-build

daviddias · web-flow · commit 56f283903849 · 2016-07-26T13:50:12.000+01:00
fix: upgrade aegir and ensure glob is mocked
diff --git a/.aegir.js b/.aegir.js
@@ -14,8 +14,8 @@ module.exports = {
       }
     },
     externals: {
-      fs: '{}',
       mkdirp: '{}',
+      glob: '{}',
       'simple-websocket-server': '{}'
     }
   }
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs#readme",
   "devDependencies": {
-    "aegir": "^3.2.0",
+    "aegir": "^4.0.0",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "expose-loader": "^0.7.1",
@@ -118,4 +118,4 @@
     "kumavis <kumavis@users.noreply.github.com>",
     "nginnever <ginneversource@gmail.com>"
   ]
-}
+}
diff --git a/test/core/both/test-bitswap.js b/test/core/both/test-bitswap.js
@@ -66,7 +66,7 @@ describe('bitswap', () => {
           // cause browser nodes don't have a websockets addrs
           // TODO, what we really need is a way to dial to a peerId only
           // and another to dial to peerInfo
-          target = multiaddr(`/ip4/0.0.0.0/tcp/0/ws/ipfs/${res.ID}`).toString()
+          target = multiaddr(`/ip4/127.0.0.1/tcp/0/ws/ipfs/${res.ID}`).toString()
         }
 
         const swarm = node2.libp2p ? node2.libp2p.swarm : node2.swarm

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ describe('bitswap', () => {`
`66`	`66`	`// cause browser nodes don't have a websockets addrs`
`67`	`67`	`// TODO, what we really need is a way to dial to a peerId only`
`68`	`68`	`// and another to dial to peerInfo`
`69`		- target = multiaddr(`/ip4/0.0.0.0/tcp/0/ws/ipfs/${res.ID}`).toString()
	`69`	+ target = multiaddr(`/ip4/127.0.0.1/tcp/0/ws/ipfs/${res.ID}`).toString()
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`const swarm = node2.libp2p ? node2.libp2p.swarm : node2.swarm`