Skip to content

Commit caa3362

Browse files
snitin315snitin315
authored
test: refactor e2e tests to use response.text() 
1 parent e5d3e83 commit caa3362

File tree

4 files changed

+19
-45
lines changed

4 files changed

+19
-45
lines changed

‎test/e2e/__snapshots__/built-in-routes.test.js.snap.webpack4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
exports[`Built in routes with multi config should handle GET request to directory index and list all middleware directories: console messages 1`] = `Array []`;
44

55
exports[`Built in routes with multi config should handle GET request to directory index and list all middleware directories: directory list 1`] = `
6-
"<h1>Assets Report:</h1><div><h2>Compilation: unnamed[0]</h2><ul><li>
6+
"<!DOCTYPE html><html><head><meta charset=\\"utf-8\\"/></head><body><h1>Assets Report:</h1><div><h2>Compilation: unnamed[0]</h2><ul><li>
77
<strong><a href=\\"/bundle1/foo.js\\" target=\\"_blank\\">foo.js</a></strong>
88
</li><li>
99
<strong><a href=\\"/bundle1/path/to/file.html\\" target=\\"_blank\\">path/to/file.html</a></strong>
1010
</li></ul></div><div><h2>Compilation: named</h2><ul><li>
1111
<strong><a href=\\"/bundle2/bar.js\\" target=\\"_blank\\">bar.js</a></strong>
1212
</li></ul></div><div><h2>Compilation: other</h2><ul><li>
1313
<strong><a href=\\"bar.js\\" target=\\"_blank\\">bar.js</a></strong>
14-
</li></ul></div>"
14+
</li></ul></div></body></html>"
1515
`;
1616

1717
exports[`Built in routes with multi config should handle GET request to directory index and list all middleware directories: page errors 1`] = `Array []`;
@@ -23,11 +23,11 @@ exports[`Built in routes with multi config should handle GET request to director
2323
exports[`Built in routes with simple config should handle GET request to directory index and list all middleware directories: console messages 1`] = `Array []`;
2424

2525
exports[`Built in routes with simple config should handle GET request to directory index and list all middleware directories: directory list 1`] = `
26-
"<h1>Assets Report:</h1><div><h2>Compilation: unnamed</h2><ul><li>
26+
"<!DOCTYPE html><html><head><meta charset=\\"utf-8\\"/></head><body><h1>Assets Report:</h1><div><h2>Compilation: unnamed</h2><ul><li>
2727
<strong><a href=\\"main.js\\" target=\\"_blank\\">main.js</a></strong>
2828
</li><li>
2929
<strong><a href=\\"test.html\\" target=\\"_blank\\">test.html</a></strong>
30-
</li></ul></div>"
30+
</li></ul></div></body></html>"
3131
`;
3232

3333
exports[`Built in routes with simple config should handle GET request to directory index and list all middleware directories: page errors 1`] = `Array []`;

‎test/e2e/__snapshots__/built-in-routes.test.js.snap.webpack5

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
exports[`Built in routes with multi config should handle GET request to directory index and list all middleware directories: console messages 1`] = `Array []`;
44

55
exports[`Built in routes with multi config should handle GET request to directory index and list all middleware directories: directory list 1`] = `
6-
"<h1>Assets Report:</h1><div><h2>Compilation: unnamed[0]</h2><ul><li>
6+
"<!DOCTYPE html><html><head><meta charset=\\"utf-8\\"/></head><body><h1>Assets Report:</h1><div><h2>Compilation: unnamed[0]</h2><ul><li>
77
<strong><a href=\\"/bundle1/foo.js\\" target=\\"_blank\\">foo.js</a></strong>
88
</li><li>
99
<strong><a href=\\"/bundle1/path/to/file.html\\" target=\\"_blank\\">path/to/file.html</a></strong>
1010
</li></ul></div><div><h2>Compilation: named</h2><ul><li>
1111
<strong><a href=\\"/bundle2/bar.js\\" target=\\"_blank\\">bar.js</a></strong>
1212
</li></ul></div><div><h2>Compilation: other</h2><ul><li>
1313
<strong><a href=\\"bar.js\\" target=\\"_blank\\">bar.js</a></strong>
14-
</li></ul></div>"
14+
</li></ul></div></body></html>"
1515
`;
1616

1717
exports[`Built in routes with multi config should handle GET request to directory index and list all middleware directories: page errors 1`] = `Array []`;
@@ -23,11 +23,11 @@ exports[`Built in routes with multi config should handle GET request to director
2323
exports[`Built in routes with simple config should handle GET request to directory index and list all middleware directories: console messages 1`] = `Array []`;
2424

2525
exports[`Built in routes with simple config should handle GET request to directory index and list all middleware directories: directory list 1`] = `
26-
"<h1>Assets Report:</h1><div><h2>Compilation: unnamed</h2><ul><li>
26+
"<!DOCTYPE html><html><head><meta charset=\\"utf-8\\"/></head><body><h1>Assets Report:</h1><div><h2>Compilation: unnamed</h2><ul><li>
2727
<strong><a href=\\"main.js\\" target=\\"_blank\\">main.js</a></strong>
2828
</li><li>
2929
<strong><a href=\\"test.html\\" target=\\"_blank\\">test.html</a></strong>
30-
</li></ul></div>"
30+
</li></ul></div></body></html>"
3131
`;
3232

3333
exports[`Built in routes with simple config should handle GET request to directory index and list all middleware directories: page errors 1`] = `Array []`;

‎test/e2e/built-in-routes.test.js

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -139,19 +139,13 @@ describe("Built in routes", () => {
139139
}
140140
);
141141

142-
const bodyHandle = await page.$("body");
143-
const htmlContent = await page.evaluate(
144-
(body) => body.innerHTML,
145-
bodyHandle
146-
);
147-
148142
expect(response.headers()["content-type"]).toMatchSnapshot(
149143
"response headers content-type"
150144
);
151145

152146
expect(response.status()).toMatchSnapshot("response status");
153147

154-
expect(htmlContent).toMatchSnapshot("directory list");
148+
expect(await response.text()).toMatchSnapshot("directory list");
155149

156150
expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
157151
"console messages"
@@ -181,19 +175,13 @@ describe("Built in routes", () => {
181175
}
182176
);
183177

184-
const bodyHandle = await page.$("body");
185-
const htmlContent = await page.evaluate(
186-
(body) => body.innerHTML,
187-
bodyHandle
188-
);
189-
190178
expect(response.headers()["content-type"]).toMatchSnapshot(
191179
"response headers content-type"
192180
);
193181

194182
expect(response.status()).toMatchSnapshot("response status");
195183

196-
expect(htmlContent).toMatchSnapshot("directory list");
184+
expect(await response.text()).toMatchSnapshot("directory list");
197185

198186
expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
199187
"console messages"
@@ -350,19 +338,13 @@ describe("Built in routes", () => {
350338
}
351339
);
352340

353-
const bodyHandle = await page.$("body");
354-
const htmlContent = await page.evaluate(
355-
(body) => body.innerHTML,
356-
bodyHandle
357-
);
358-
359341
expect(response.headers()["content-type"]).toMatchSnapshot(
360342
"response headers content-type"
361343
);
362344

363345
expect(response.status()).toMatchSnapshot("response status");
364346

365-
expect(htmlContent).toMatchSnapshot("directory list");
347+
expect(await response.text()).toMatchSnapshot("directory list");
366348

367349
expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
368350
"console messages"

‎test/e2e/universal-compiler.test.js

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,14 @@ describe("Universal compiler", () => {
2929
pageErrors.push(error);
3030
});
3131

32-
await page.goto(`http://127.0.0.1:${port}/client.js`, {
32+
const response = await page.goto(`http://127.0.0.1:${port}/client.js`, {
3333
waitUntil: "networkidle0",
3434
});
3535

36-
const bodyHandle = await page.$("body");
37-
const htmlContent = await page.evaluate(
38-
(body) => body.innerHTML,
39-
bodyHandle
40-
);
36+
const responseText = await response.text();
4137

42-
expect(htmlContent).toContain("Hello from the client");
43-
expect(htmlContent).toContain("WebsocketClient");
38+
expect(responseText).toContain("Hello from the client");
39+
expect(responseText).toContain("WebsocketClient");
4440

4541
expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
4642
"console messages"
@@ -76,18 +72,14 @@ describe("Universal compiler", () => {
7672
pageErrors.push(error);
7773
});
7874

79-
await page.goto(`http://127.0.0.1:${port}/server.js`, {
75+
const response = await page.goto(`http://127.0.0.1:${port}/server.js`, {
8076
waitUntil: "networkidle0",
8177
});
8278

83-
const bodyHandle = await page.$("body");
84-
const htmlContent = await page.evaluate(
85-
(body) => body.innerHTML,
86-
bodyHandle
87-
);
79+
const responseText = await response.text();
8880

89-
expect(htmlContent).toContain("Hello from the server");
90-
expect(htmlContent).not.toContain("WebsocketServer");
81+
expect(responseText).toContain("Hello from the server");
82+
expect(responseText).not.toContain("WebsocketServer");
9183

9284
expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
9385
"console messages"

0 commit comments

Comments
 (0)