Merge pull request #228 from Yurickh/fix/expired-listener

Fix expired listener and emitter
pactflow · Dec 10, 2024 · 020b6d8 · 020b6d8
2 parents 7bd19d6 + 274501e
commit 020b6d8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/pactFromMswServer.msw.spec.ts b/src/pactFromMswServer.msw.spec.ts
@@ -113,6 +113,15 @@ describe("API - With MSW mock generating a pact", () => {
     expect(respProduct).toEqual(hiddenVisibilityProduct);
   });
 
+  test("handle requests mocked with error", async () => {
+    server.use(
+      http.get(API.url + "/product/10", () => HttpResponse.error())
+    );
+
+    // This request is going to be marked as expired after the test is finished and should be handled gracefully by the subsequent writeToFile()
+    await expect(()=> API.getProduct("10")).rejects.toEqual(new Error('TypeError: Network error'))
+  })
+
   test("unhandled route", async () => {
     await expect(API.getProduct("11")).rejects.toThrow(
       /^Error: connect ECONNREFUSED (127.0.0.1|::1):8081.*$/

diff --git a/src/pactMswAdapter.ts b/src/pactMswAdapter.ts
@@ -102,12 +102,12 @@ export const setupPactMswAdapter = ({
     setTimeout(() => {
       const expired = { requestId, startTime, request }
       const activeIdx = activeRequestIds.indexOf(requestId);
-      emitter.emit("pact-msw-adapter:expired", expired);
       if (activeIdx >= 0) {
         // Could be removed if completed or the test ended
         activeRequestIds.splice(activeIdx, 1);
         expiredRequests.push(expired);
       }
+      emitter.emit("pact-msw-adapter:expired", expired);
     }, options.timeout);
   });
 
@@ -301,7 +301,7 @@ const transformMswToPact = async (
       }
 
       const events = [
-        "pact-msw-adapter:expired ",
+        "pact-msw-adapter:expired",
         "pact-msw-adapter:match",
         "pact-msw-adapter:new-test",
         "pact-msw-adapter:clear",