From eb5ba6db4e2f9ae84f1e46ac4ff4206d6133d4a3 Mon Sep 17 00:00:00 2001 From: Allan Zheng Date: Fri, 29 May 2020 16:58:36 -0700 Subject: [PATCH 1/2] test(eventstream-handler-node): fix test broken in Node14 --- .../src/EventStreamPayloadHandler.spec.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/eventstream-handler-node/src/EventStreamPayloadHandler.spec.ts b/packages/eventstream-handler-node/src/EventStreamPayloadHandler.spec.ts index c6e1b8322666..6f137dfb8115 100644 --- a/packages/eventstream-handler-node/src/EventStreamPayloadHandler.spec.ts +++ b/packages/eventstream-handler-node/src/EventStreamPayloadHandler.spec.ts @@ -40,6 +40,7 @@ describe("EventStreamPayloadHandler", () => { }); it("should close the request payload if downstream middleware throws", async () => { + expect.assertions(2); (mockNextHandler as any).mockImplementationOnce(() => Promise.reject(new Error()) ); @@ -61,9 +62,10 @@ describe("EventStreamPayloadHandler", () => { expect(error instanceof Error).toBe(true); //Expect stream is closed //Ref: should use writableEnded when bumped to Node 13+ - expect(() => { - mockRequest.body.write(""); - }).toThrowError("write after end"); + (mockRequest.body as PassThrough).on("error", err => { + expect(err.message).toEqual("write after end"); + }); + mockRequest.body.write("This should be allowed to write."); }); it("should call event signer with request signature from signing middleware", async () => { From 61a1eea067392796c56287ee6bad5ee8981721ab Mon Sep 17 00:00:00 2001 From: Allan Zheng Date: Mon, 1 Jun 2020 11:19:03 -0700 Subject: [PATCH 2/2] test(eventstream-handler-node): fix test in Node14 --- .../src/EventStreamPayloadHandler.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/eventstream-handler-node/src/EventStreamPayloadHandler.spec.ts b/packages/eventstream-handler-node/src/EventStreamPayloadHandler.spec.ts index 6f137dfb8115..b05888683f67 100644 --- a/packages/eventstream-handler-node/src/EventStreamPayloadHandler.spec.ts +++ b/packages/eventstream-handler-node/src/EventStreamPayloadHandler.spec.ts @@ -39,7 +39,7 @@ describe("EventStreamPayloadHandler", () => { ).rejects.toThrow("Eventstream payload must be a Readable stream."); }); - it("should close the request payload if downstream middleware throws", async () => { + it("should close the request payload if downstream middleware throws", async done => { expect.assertions(2); (mockNextHandler as any).mockImplementationOnce(() => Promise.reject(new Error()) @@ -64,6 +64,7 @@ describe("EventStreamPayloadHandler", () => { //Ref: should use writableEnded when bumped to Node 13+ (mockRequest.body as PassThrough).on("error", err => { expect(err.message).toEqual("write after end"); + done(); }); mockRequest.body.write("This should be allowed to write."); });