From abcc3837e91f0abd6391e12f3daf5a6bb02b0020 Mon Sep 17 00:00:00 2001 From: Tim Lai Date: Fri, 31 Jul 2020 10:07:52 -0700 Subject: [PATCH] fix(requestInterceptor): use async/await to support return new Promise (#6279) ref: #4778 --- src/core/plugins/spec/actions.js | 4 ++-- test/mocha/core/plugins/spec/actions.js | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/core/plugins/spec/actions.js b/src/core/plugins/spec/actions.js index 293fb1ae..c37345df 100644 --- a/src/core/plugins/spec/actions.js +++ b/src/core/plugins/spec/actions.js @@ -429,8 +429,8 @@ export const executeRequest = (req) => specActions.setRequest(req.pathName, req.method, parsedRequest) - let requestInterceptorWrapper = function(r) { - let mutatedRequest = requestInterceptor.apply(this, [r]) + let requestInterceptorWrapper = async (r) => { + let mutatedRequest = await requestInterceptor.apply(this, [r]) let parsedMutatedRequest = Object.assign({}, mutatedRequest) specActions.setMutatedRequest(req.pathName, req.method, parsedMutatedRequest) return mutatedRequest diff --git a/test/mocha/core/plugins/spec/actions.js b/test/mocha/core/plugins/spec/actions.js index 235aabba..8010e617 100644 --- a/test/mocha/core/plugins/spec/actions.js +++ b/test/mocha/core/plugins/spec/actions.js @@ -93,7 +93,7 @@ describe("spec plugin - actions", function(){ }) }) - it("should pass requestInterceptor/responseInterceptor to fn.execute", function(){ + it("should pass requestInterceptor/responseInterceptor to fn.execute", async () => { // Given let configs = { requestInterceptor: createSpy(), @@ -107,7 +107,8 @@ describe("spec plugin - actions", function(){ specActions: { executeRequest: createSpy(), setMutatedRequest: createSpy(), - setRequest: createSpy() + setRequest: createSpy(), + setResponse: createSpy() }, specSelectors: { spec: () => fromJS({}), @@ -124,7 +125,7 @@ describe("spec plugin - actions", function(){ method: "GET", operation: fromJS({operationId: "getOne"}) }) - let res = executeFn(system) + await executeFn(system) // Then expect(system.fn.execute.calls.length).toEqual(1) @@ -137,7 +138,7 @@ describe("spec plugin - actions", function(){ let wrappedRequestInterceptor = system.fn.execute.calls[0].arguments[0].requestInterceptor - wrappedRequestInterceptor(system.fn.execute.calls[0].arguments[0]) + await wrappedRequestInterceptor(system.fn.execute.calls[0].arguments[0]) expect(configs.requestInterceptor.calls.length).toEqual(1) expect(system.specActions.setMutatedRequest.calls.length).toEqual(1) expect(system.specActions.setRequest.calls.length).toEqual(1)