fix: only require http api client if it has not been specified

If we configure which http api module to use, don't try to require
`ipfs-http-client`, because that then means the containing project
needs to specify a dependency on `ipfs-http-client` when the
containing project might actually be `ipfs-http-client`...

Author: achingbrain

src/factory.js

@@ -21,11 +21,14 @@ const defaults = {
   type: 'go',
   env: {},
   args: [],
+<<<<<<< HEAD
   ipfsHttpModule: {
     path: require.resolve('ipfs-http-client'),
     ref: require('ipfs-http-client')
   },
   ipfsModule: {},
+=======
+>>>>>>> fix: only require http api client if it has not been specified
   ipfsOptions: {},
   forceKill: true,
   forceKillTimeout: 5000
@@ -126,6 +129,16 @@ class Factory {
       options
     )
 
+    // only include the http api client if it has not been specified as an option
+    // for example if we are testing the http api client itself we should not try
+    // to require 'ipfs-http-client'
+    if (!opts.ipfsHttpModule) {
+      opts.ipfsHttpModule = {
+        path: require.resolve('ipfs-http-client'),
+        ref: require('ipfs-http-client')
+      }
+    }
+
     // IPFS options defaults
     const ipfsOptions = merge(
       {