From 01f86992793d20a5335a6135800bb8d2dd506922 Mon Sep 17 00:00:00 2001 From: Kjell-Morten Date: Sat, 29 Sep 2018 12:27:57 +0200 Subject: [PATCH] Fix bug with missing endpointOptions --- lib/adapter/prepareEndpoint-test.js | 10 ++++++++++ lib/adapter/prepareEndpoint.js | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/adapter/prepareEndpoint-test.js b/lib/adapter/prepareEndpoint-test.js index 2d927db..f40d1cc 100644 --- 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 index d427849..b8cfc8d 100644 --- 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