fix: enable tests of addFromURL in browser

Context: ipfs-inactive/interface-js-ipfs-core#514

License: MIT
Signed-off-by: Marcin Rataj <[email protected]>

Author: lidel

.aegir.js

@@ -3,9 +3,20 @@
 const IPFSFactory = require('ipfsd-ctl')
 const parallel = require('async/parallel')
 const MockPreloadNode = require('./test/utils/mock-preload-node')
+const EchoHttpServer = require('interface-ipfs-core/src/utils/echo-http-server')
 
 const ipfsdServer = IPFSFactory.createServer()
 const preloadNode = MockPreloadNode.createNode()
+const httpEchoServer = EchoHttpServer.createServer() // used by addFromURL
+
+const batch = (call, done, ...srvs) => parallel(srvs.map(srv => cb => {
+  if (srv === ipfsdServer) {
+    srv[call]()
+    cb()
+  } else {
+    srv[call](cb)
+  }
+}), done)
 
 module.exports = {
   bundlesize: { maxSize: '692kB' },
@@ -30,24 +41,8 @@ module.exports = {
       post: (cb) => preloadNode.stop(cb)
     },
     browser: {
-      pre: (cb) => {
-        parallel([
-          (cb) => {
-            ipfsdServer.start()
-            cb()
-          },
-          (cb) => preloadNode.start(cb)
-        ], cb)
-      },
-      post: (cb) => {
-        parallel([
-          (cb) => {
-            ipfsdServer.stop()
-            cb()
-          },
-          (cb) => preloadNode.stop(cb)
-        ], cb)
-      }
+      pre: (cb) => batch('start', cb, ipfsdServer, preloadNode, httpEchoServer),
+      post: (cb) => batch('stop', cb, ipfsdServer, preloadNode, httpEchoServer)
     }
   }
 }

package.json

@@ -193,7 +193,7 @@
     "execa": "^2.0.4",
     "form-data": "^2.5.0",
     "hat": "0.0.3",
-    "interface-ipfs-core": "^0.110.0",
+    "interface-ipfs-core": "https://github.com/ipfs/interface-js-ipfs-core/tarball/38794027dac19ebaab3fec710d324d297599c08d/interface-js-ipfs-core.tar.gz#PR-514",
     "ipfsd-ctl": "^0.43.0",
     "libp2p-websocket-star": "~0.10.2",
     "ncp": "^2.0.0",

src/core/components/files-regular/add-from-url.js

@@ -2,15 +2,6 @@
 
 const { URL } = require('iso-url')
 const nodeify = require('promise-nodeify')
-const { isElectronRenderer } = require('ipfs-utils/src/env')
-if (isElectronRenderer) {
-  // `fetch` needs to be polyfilled before importing ky-universal:
-  // ky-universal won't use node-fetch because electron-renderer already has global.fetch defined
-  // and we can't use the one from electron-renderer as it returns different
-  // errors and makes HTTPS mocking impossible in tests
-  // TODO: remove when upstream fix lands
-  global.fetch = require('node-fetch')
-}
 const { default: ky } = require('ky-universal')
 
 module.exports = (ipfs) => {

test/core/interface.spec.js

@@ -63,9 +63,6 @@ describe('interface-ipfs-core tests', function () {
     }, {
       name: 'addFromFs',
       reason: 'Not designed to run in the browser'
-    }, {
-      name: 'addFromURL',
-      reason: 'Not designed to run in the browser'
     }]
   })