fix(resolver): pass global http option via resolve instance method (#1560)

Along with that, optional options paramter have been added to resolve instance
method to allow overrides.

Refs #1479

Author: char0n

src/index.js

@@ -1,4 +1,3 @@
-import cloneDeep from 'lodash/cloneDeep'
 import assign from 'lodash/assign'
 import startsWith from 'lodash/startsWith'
 import Url from 'url'
@@ -54,7 +53,7 @@ Swagger.prototype = {
 
   http: Http,
 
-  execute(argHash) {
+  execute(options) {
     this.applyDefaults()
 
     return Swagger.execute({
@@ -64,18 +63,20 @@ Swagger.prototype = {
       contextUrl: typeof this.url === 'string' ? this.url : undefined,
       requestInterceptor: this.requestInterceptor || null,
       responseInterceptor: this.responseInterceptor || null,
-      ...argHash
+      ...options
     })
   },
 
-  resolve() {
+  resolve(options = {}) {
     return Swagger.resolve({
       spec: this.spec,
       url: this.url,
+      http: this.http,
       allowMetaPatches: this.allowMetaPatches,
       useCircularStructures: this.useCircularStructures,
       requestInterceptor: this.requestInterceptor || null,
-      responseInterceptor: this.responseInterceptor || null
+      responseInterceptor: this.responseInterceptor || null,
+      ...options,
     }).then((obj) => {
       this.originalSpec = this.spec
       this.spec = obj.spec

test/index.js

@@ -588,6 +588,54 @@ describe('constructor', () => {
     })
   })
 
+  describe('#resolve', () => {
+    let originalResolveFn
+
+    beforeEach(() => {
+      originalResolveFn = Swagger.resolve
+      Swagger.resolve = jest.fn(async obj => obj)
+    })
+
+    afterEach(() => {
+      Swagger.resolve = originalResolveFn
+    })
+
+    test('should use global http option', async () => {
+      const spec = {
+        paths: {
+          '/pet': {
+            get: {
+              operationId: 'getPets',
+            }
+          }
+        }
+      }
+      const http = jest.fn()
+      const client = await Swagger({spec, http})
+      await client.resolve()
+
+      expect(Swagger.resolve.mock.calls[0][0].http).toStrictEqual(http)
+    })
+
+    test('should support passing additional options', async () => {
+      const spec = {
+        paths: {
+          '/pet': {
+            get: {
+              operationId: 'getPets',
+            }
+          }
+        }
+      }
+      const http = jest.fn()
+      const requestInterceptor = jest.fn()
+      const client = await Swagger({spec, http})
+      await client.resolve({requestInterceptor})
+
+      expect(Swagger.resolve.mock.calls[1][0].requestInterceptor).toStrictEqual(requestInterceptor)
+    })
+  })
+
   describe('interceptor', () => {
     beforeEach(() => {
       Swagger.clearCache()