test: refactor lazy compilation and logging tests to cleanup properly (#4913)

Author: snitin315

test/e2e/lazy-compilation.test.js

@@ -17,35 +17,39 @@ describe("lazy compilation", () => {
 
     const { page, browser } = await runBrowser();
 
-    const pageErrors = [];
-    const consoleMessages = [];
-
-    page
-      .on("console", (message) => {
-        consoleMessages.push(message.text());
-      })
-      .on("pageerror", (error) => {
-        pageErrors.push(error);
+    try {
+      const pageErrors = [];
+      const consoleMessages = [];
+
+      page
+        .on("console", (message) => {
+          consoleMessages.push(message.text());
+        })
+        .on("pageerror", (error) => {
+          pageErrors.push(error);
+        });
+
+      await page.goto(`http://127.0.0.1:${port}/test.html`, {
+        waitUntil: "domcontentloaded",
+      });
+      await new Promise((resolve) => {
+        const interval = setInterval(() => {
+          if (consoleMessages.includes("Hey.")) {
+            clearInterval(interval);
+
+            resolve();
+          }
+        }, 100);
       });
 
-    await page.goto(`http://127.0.0.1:${port}/test.html`, {
-      waitUntil: "domcontentloaded",
-    });
-    await new Promise((resolve) => {
-      const interval = setInterval(() => {
-        if (consoleMessages.includes("Hey.")) {
-          clearInterval(interval);
-
-          resolve();
-        }
-      }, 100);
-    });
-
-    expect(consoleMessages).toMatchSnapshot("console messages");
-    expect(pageErrors).toMatchSnapshot("page errors");
-
-    await browser.close();
-    await server.stop();
+      expect(consoleMessages).toMatchSnapshot("console messages");
+      expect(pageErrors).toMatchSnapshot("page errors");
+    } catch (error) {
+      throw error;
+    } finally {
+      await browser.close();
+      await server.stop();
+    }
   });
 
   it.skip(`should work with multiple entries`, async () => {
@@ -56,49 +60,53 @@ describe("lazy compilation", () => {
 
     const { page, browser } = await runBrowser();
 
-    const pageErrors = [];
-    const consoleMessages = [];
+    try {
+      const pageErrors = [];
+      const consoleMessages = [];
+
+      page
+        .on("console", (message) => {
+          consoleMessages.push(message.text());
+        })
+        .on("pageerror", (error) => {
+          pageErrors.push(error);
+        });
 
-    page
-      .on("console", (message) => {
-        consoleMessages.push(message.text());
-      })
-      .on("pageerror", (error) => {
-        pageErrors.push(error);
+      await page.goto(`http://127.0.0.1:${port}/test-one.html`, {
+        waitUntil: "domcontentloaded",
+      });
+      await new Promise((resolve) => {
+        const interval = setInterval(() => {
+          console.log(consoleMessages);
+          if (consoleMessages.includes("One.")) {
+            clearInterval(interval);
+
+            resolve();
+          }
+        }, 100);
+      });
+
+      await page.goto(`http://127.0.0.1:${port}/test-two.html`, {
+        waitUntil: "domcontentloaded",
+      });
+      await new Promise((resolve) => {
+        const interval = setInterval(() => {
+          console.log(consoleMessages);
+          if (consoleMessages.includes("Two.")) {
+            clearInterval(interval);
+
+            resolve();
+          }
+        }, 100);
       });
 
-    await page.goto(`http://127.0.0.1:${port}/test-one.html`, {
-      waitUntil: "domcontentloaded",
-    });
-    await new Promise((resolve) => {
-      const interval = setInterval(() => {
-        console.log(consoleMessages);
-        if (consoleMessages.includes("One.")) {
-          clearInterval(interval);
-
-          resolve();
-        }
-      }, 100);
-    });
-
-    await page.goto(`http://127.0.0.1:${port}/test-two.html`, {
-      waitUntil: "domcontentloaded",
-    });
-    await new Promise((resolve) => {
-      const interval = setInterval(() => {
-        console.log(consoleMessages);
-        if (consoleMessages.includes("Two.")) {
-          clearInterval(interval);
-
-          resolve();
-        }
-      }, 100);
-    });
-
-    expect(consoleMessages).toMatchSnapshot("console messages");
-    expect(pageErrors).toMatchSnapshot("page errors");
-
-    await browser.close();
-    await server.stop();
+      expect(consoleMessages).toMatchSnapshot("console messages");
+      expect(pageErrors).toMatchSnapshot("page errors");
+    } catch (error) {
+      throw error;
+    } finally {
+      await browser.close();
+      await server.stop();
+    }
   });
 });

test/e2e/logging.test.js

@@ -204,41 +204,45 @@ describe("logging", () => {
 
         const { page, browser } = await runBrowser();
 
-        const consoleMessages = [];
+        try {
+          const consoleMessages = [];
 
-        page.on("console", (message) => {
-          consoleMessages.push(message);
-        });
-
-        await page.goto(`http://localhost:${port}/`, {
-          waitUntil: "networkidle0",
-        });
-
-        if (testCase.devServerOptions && testCase.devServerOptions.static) {
-          fs.writeFileSync(
-            path.join(testCase.devServerOptions.static, "./foo.txt"),
-            "Text"
-          );
+          page.on("console", (message) => {
+            consoleMessages.push(message);
+          });
 
-          await page.waitForNavigation({
+          await page.goto(`http://localhost:${port}/`, {
             waitUntil: "networkidle0",
           });
-        }
 
-        expect(
-          consoleMessages.map((message) =>
-            message
-              .text()
-              .replace(/\\/g, "/")
-              .replace(
-                new RegExp(process.cwd().replace(/\\/g, "/"), "g"),
-                "<cwd>"
-              )
-          )
-        ).toMatchSnapshot();
+          if (testCase.devServerOptions && testCase.devServerOptions.static) {
+            fs.writeFileSync(
+              path.join(testCase.devServerOptions.static, "./foo.txt"),
+              "Text"
+            );
+
+            await page.waitForNavigation({
+              waitUntil: "networkidle0",
+            });
+          }
 
-        await browser.close();
-        await server.stop();
+          expect(
+            consoleMessages.map((message) =>
+              message
+                .text()
+                .replace(/\\/g, "/")
+                .replace(
+                  new RegExp(process.cwd().replace(/\\/g, "/"), "g"),
+                  "<cwd>"
+                )
+            )
+          ).toMatchSnapshot();
+        } catch (error) {
+          throw error;
+        } finally {
+          await browser.close();
+          await server.stop();
+        }
       });
     });
   });