Skip to content

Commit cf0f883

Browse files
snitin315alexander-akait
authored andcommitted
test: refactor target tests to cleanup properly (#4919)
1 parent b9e968d commit cf0f883

File tree

1 file changed

+38
-34
lines changed

1 file changed

+38
-34
lines changed

test/e2e/target.test.js

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -43,46 +43,50 @@ describe("target", () => {
4343

4444
const { page, browser } = await runBrowser();
4545

46-
const pageErrors = [];
47-
const consoleMessages = [];
46+
try {
47+
const pageErrors = [];
48+
const consoleMessages = [];
4849

49-
page
50-
.on("console", (message) => {
51-
consoleMessages.push(message);
52-
})
53-
.on("pageerror", (error) => {
54-
pageErrors.push(error);
55-
});
50+
page
51+
.on("console", (message) => {
52+
consoleMessages.push(message);
53+
})
54+
.on("pageerror", (error) => {
55+
pageErrors.push(error);
56+
});
5657

57-
await page.goto(`http://127.0.0.1:${port}/`, {
58-
waitUntil: "networkidle0",
59-
});
58+
await page.goto(`http://127.0.0.1:${port}/`, {
59+
waitUntil: "networkidle0",
60+
});
6061

61-
expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
62-
"console messages"
63-
);
62+
expect(
63+
consoleMessages.map((message) => message.text())
64+
).toMatchSnapshot("console messages");
6465

65-
if (
66-
target === "node" ||
67-
target === "async-node" ||
68-
target === "electron-main" ||
69-
target === "electron-preload" ||
70-
target === "electron-renderer" ||
71-
target === "nwjs" ||
72-
target === "node-webkit"
73-
) {
74-
const hasRequireOrGlobalError =
75-
pageErrors.filter((pageError) =>
76-
/require is not defined|global is not defined/.test(pageError)
77-
).length === 1;
66+
if (
67+
target === "node" ||
68+
target === "async-node" ||
69+
target === "electron-main" ||
70+
target === "electron-preload" ||
71+
target === "electron-renderer" ||
72+
target === "nwjs" ||
73+
target === "node-webkit"
74+
) {
75+
const hasRequireOrGlobalError =
76+
pageErrors.filter((pageError) =>
77+
/require is not defined|global is not defined/.test(pageError)
78+
).length === 1;
7879

79-
expect(hasRequireOrGlobalError).toBe(true);
80-
} else {
81-
expect(pageErrors).toMatchSnapshot("page errors");
80+
expect(hasRequireOrGlobalError).toBe(true);
81+
} else {
82+
expect(pageErrors).toMatchSnapshot("page errors");
83+
}
84+
} catch (error) {
85+
throw error;
86+
} finally {
87+
await browser.close();
88+
await server.stop();
8289
}
83-
84-
await browser.close();
85-
await server.stop();
8690
});
8791
}
8892
});

0 commit comments

Comments
 (0)