Skip to content

Commit a23cbfb

Browse files
authored
Merge pull request #385 from openreachtech/update/generateRendererHandler-of-RestfulApiRoutesBuilder
💪 Update `RestfulApiRoutesBuilder#generateRendererHandler()` with `ResponseFlusher` structure
2 parents 208e708 + 0bfc507 commit a23cbfb

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

lib/server/restfulapi/RestfulApiRoutesBuilder.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ export default class RestfulApiRoutesBuilder {
209209
expressRequest: req,
210210
})
211211

212-
this.flushResponse({
212+
renderer.flushResponse({
213213
expressResponse: res,
214-
response,
214+
renderResponse: response,
215215
})
216216
}
217217
}

tests/__tests__/server/restfulapi/RestfulApiRoutesBuilder.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,9 @@ describe('RestfulApiRoutesBuilder', () => {
605605
json () {
606606
return this
607607
},
608+
set () {
609+
return this
610+
},
608611
})
609612

610613
/** @type {ExpressType.NextFunction} */
@@ -658,7 +661,7 @@ describe('RestfulApiRoutesBuilder', () => {
658661
})
659662
})
660663

661-
describe('to call #flushResponse()', () => {
664+
describe('to call Renderer#flushResponse()', () => {
662665
describe.each(engineCases)('Engine: $params.Engine.name', ({ params }) => {
663666
test.each(cases)('renderer: $renderer.constructor.name', async ({ renderer, filterHandler }) => {
664667
const engine = await params.Engine.createAsync()
@@ -677,7 +680,8 @@ describe('RestfulApiRoutesBuilder', () => {
677680

678681
jest.spyOn(builder, 'generateExceptionProxyRender')
679682
.mockReturnValue(exceptionProxyRenderTally)
680-
const flushResponseSpy = jest.spyOn(builder, 'flushResponse')
683+
684+
const flushResponseSpy = jest.spyOn(renderer, 'flushResponse')
681685

682686
const handler = builder.generateRendererHandler({
683687
renderer,
@@ -692,7 +696,7 @@ describe('RestfulApiRoutesBuilder', () => {
692696

693697
const expected = {
694698
expressResponse: expressResponseMock,
695-
response: responseTally,
699+
renderResponse: responseTally,
696700
}
697701

698702
expect(flushResponseSpy)

0 commit comments

Comments
 (0)