fix: configure tests

License: MIT
Signed-off-by: Alan Shaw <[email protected]>

Author: Alan Shaw

src/lib/configure.js

@@ -1,7 +1,7 @@
 'use strict'
 /* eslint-env browser */
 
-const ky = require('ky-universal')
+const ky = require('ky-universal').default
 const { isBrowser, isWebWorker } = require('ipfs-utils/src/env')
 const { toUri } = require('./multiaddr')
 const errorHandler = require('./error-handler')
@@ -18,11 +18,6 @@ module.exports = create => config => {
     config = { ...config }
   }
 
-  if (config.protocol || config.host || config.port) {
-    const port = config.port ? `:${config.port}` : ''
-    config.apiAddr = `${config.protocol || 'http'}://${config.host || 'localhost'}${port}`
-  }
-
   config.apiAddr = (config.apiAddr || getDefaultApiAddr(config)).toString()
   config.apiAddr = config.apiAddr.startsWith('/') ? toUri(config.apiAddr) : config.apiAddr
   config.apiPath = config.apiPath || config['api-path'] || '/api/v0'
@@ -37,7 +32,8 @@ module.exports = create => config => {
       hooks: {
         afterResponse: [errorHandler]
       }
-    })
+    }),
+    ...config
   })
 }
 

test/lib.configure.spec.js

@@ -14,7 +14,7 @@ describe('lib/configure', () => {
   it('should accept no config', () => {
     configure(config => {
       if (isBrowser || isWebWorker) {
-        expect(config.apiAddr).to.eql(location.origin)
+        expect(config.apiAddr).to.eql('')
       } else {
         expect(config.apiAddr).to.eql('http://localhost:5001')
       }
@@ -48,7 +48,7 @@ describe('lib/configure', () => {
       if (isBrowser || isWebWorker) {
         expect(config.apiAddr).to.eql(`https://${location.host}`)
       } else {
-        expect(config.apiAddr).to.eql('https://localhost')
+        expect(config.apiAddr).to.eql('https://localhost:5001')
       }
     })(input)
   })
@@ -59,7 +59,7 @@ describe('lib/configure', () => {
       if (isBrowser || isWebWorker) {
         expect(config.apiAddr).to.eql(`http://ipfs.io:${location.port}`)
       } else {
-        expect(config.apiAddr).to.eql('http://ipfs.io')
+        expect(config.apiAddr).to.eql('http://ipfs.io:5001')
       }
     })(input)
   })