Fix bug with missing endpointOptions

integreat-io · Sep 29, 2018 · 01f8699 · 01f8699
1 parent 3a9635e
commit 01f8699
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/adapter/prepareEndpoint-test.js b/lib/adapter/prepareEndpoint-test.js
@@ -24,6 +24,16 @@ test('should merge with serviceOptions', (t) => {
   t.deepEqual(ret, expected)
 })
 
+test('should use serviceOptions when no endpointOptions', (t) => {
+  const serviceOptions = {
+    uri: 'http://othersoap.com/', soap: { version: '1.2' }
+  }
+
+  const ret = prepareEndpoint(undefined, serviceOptions)
+
+  t.deepEqual(ret, serviceOptions)
+})
+
 test('should always return object', (t) => {
   const ret = prepareEndpoint(null)
 

diff --git a/lib/adapter/prepareEndpoint.js b/lib/adapter/prepareEndpoint.js
@@ -1,7 +1,9 @@
 const { mergeDeepRight } = require('ramda')
 
 function prepareEndpoint (endpointOptions, serviceOptions) {
-  return mergeDeepRight(serviceOptions, endpointOptions)
+  return (endpointOptions)
+    ? mergeDeepRight(serviceOptions, endpointOptions)
+    : serviceOptions || {}
 }
 
 module.exports = prepareEndpoint