Kill hanging process after integration tests complete

cloudflare · Mar 22, 2022 · 1a0f403 · 1a0f403
1 parent bb8e1ed
commit 1a0f403
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/packages/example-pages-functions-app/tests/index.test.ts b/packages/example-pages-functions-app/tests/index.test.ts
@@ -1,4 +1,4 @@
-import { spawn } from "child_process";
+import { ChildProcess, spawn } from "child_process";
 import { resolve } from "path";
 import { fetch } from "undici";
 import type { Response } from "undici";
@@ -19,9 +19,11 @@ const waitUntilReady = async (url: string): Promise<Response> => {
 
 const isWindows = process.platform === "win32";
 
-describe("Remix", () => {
+describe("Pages Functions", () => {
+  let wranglerProcess: ChildProcess;
+
   beforeAll(async () => {
-    const wranglerProcess = spawn("npm", ["run", "dev"], {
+    wranglerProcess = spawn("npm", ["run", "dev"], {
       shell: isWindows,
       cwd: resolve(__dirname, "../"),
       env: { BROWSER: "none", ...process.env },
@@ -34,6 +36,10 @@ describe("Remix", () => {
     });
   });
 
+  afterAll(() => {
+    wranglerProcess.kill();
+  });
+
   it("renders static pages", async () => {
     const response = await waitUntilReady("http://localhost:8789/");
     const text = await response.text();

diff --git a/packages/example-remix-pages-app/tests/index.test.ts b/packages/example-remix-pages-app/tests/index.test.ts
@@ -1,4 +1,4 @@
-import { spawn, spawnSync } from "child_process";
+import { ChildProcess, spawn, spawnSync } from "child_process";
 import { resolve } from "path";
 import { fetch } from "undici";
 import type { Response } from "undici";
@@ -20,12 +20,14 @@ const waitUntilReady = async (url: string): Promise<Response> => {
 const isWindows = process.platform === "win32";
 
 describe("Remix", () => {
+  let wranglerProcess: ChildProcess;
+
   beforeAll(async () => {
     spawnSync("npm", ["run", "build"], {
       shell: isWindows,
       cwd: resolve(__dirname, "../"),
     });
-    const wranglerProcess = spawn("npm", ["run", "dev:wrangler"], {
+    wranglerProcess = spawn("npm", ["run", "dev:wrangler"], {
       shell: isWindows,
       cwd: resolve(__dirname, "../"),
       env: { BROWSER: "none", ...process.env },
@@ -38,6 +40,10 @@ describe("Remix", () => {
     });
   });
 
+  afterAll(() => {
+    wranglerProcess.kill();
+  });
+
   it("renders", async () => {
     const response = await waitUntilReady("http://localhost:8788/");
     const text = await response.text();