Skip to content

Commit

Permalink
test: refactor e2e tests to use response.text()
Browse files Browse the repository at this point in the history
  • Loading branch information
snitin315 authored Aug 29, 2021
1 parent e5d3e83 commit caa3362
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 45 deletions.
8 changes: 4 additions & 4 deletions test/e2e/__snapshots__/built-in-routes.test.js.snap.webpack4
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
exports[`Built in routes with multi config should handle GET request to directory index and list all middleware directories: console messages 1`] = `Array []`;

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

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

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

exports[`Built in routes with simple config should handle GET request to directory index and list all middleware directories: page errors 1`] = `Array []`;
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/__snapshots__/built-in-routes.test.js.snap.webpack5
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
exports[`Built in routes with multi config should handle GET request to directory index and list all middleware directories: console messages 1`] = `Array []`;

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

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

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

exports[`Built in routes with simple config should handle GET request to directory index and list all middleware directories: page errors 1`] = `Array []`;
Expand Down
24 changes: 3 additions & 21 deletions test/e2e/built-in-routes.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,19 +139,13 @@ describe("Built in routes", () => {
}
);

const bodyHandle = await page.$("body");
const htmlContent = await page.evaluate(
(body) => body.innerHTML,
bodyHandle
);

expect(response.headers()["content-type"]).toMatchSnapshot(
"response headers content-type"
);

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

expect(htmlContent).toMatchSnapshot("directory list");
expect(await response.text()).toMatchSnapshot("directory list");

expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
"console messages"
Expand Down Expand Up @@ -181,19 +175,13 @@ describe("Built in routes", () => {
}
);

const bodyHandle = await page.$("body");
const htmlContent = await page.evaluate(
(body) => body.innerHTML,
bodyHandle
);

expect(response.headers()["content-type"]).toMatchSnapshot(
"response headers content-type"
);

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

expect(htmlContent).toMatchSnapshot("directory list");
expect(await response.text()).toMatchSnapshot("directory list");

expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
"console messages"
Expand Down Expand Up @@ -350,19 +338,13 @@ describe("Built in routes", () => {
}
);

const bodyHandle = await page.$("body");
const htmlContent = await page.evaluate(
(body) => body.innerHTML,
bodyHandle
);

expect(response.headers()["content-type"]).toMatchSnapshot(
"response headers content-type"
);

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

expect(htmlContent).toMatchSnapshot("directory list");
expect(await response.text()).toMatchSnapshot("directory list");

expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
"console messages"
Expand Down
24 changes: 8 additions & 16 deletions test/e2e/universal-compiler.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,14 @@ describe("Universal compiler", () => {
pageErrors.push(error);
});

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

const bodyHandle = await page.$("body");
const htmlContent = await page.evaluate(
(body) => body.innerHTML,
bodyHandle
);
const responseText = await response.text();

expect(htmlContent).toContain("Hello from the client");
expect(htmlContent).toContain("WebsocketClient");
expect(responseText).toContain("Hello from the client");
expect(responseText).toContain("WebsocketClient");

expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
"console messages"
Expand Down Expand Up @@ -76,18 +72,14 @@ describe("Universal compiler", () => {
pageErrors.push(error);
});

await page.goto(`http://127.0.0.1:${port}/server.js`, {
const response = await page.goto(`http://127.0.0.1:${port}/server.js`, {
waitUntil: "networkidle0",
});

const bodyHandle = await page.$("body");
const htmlContent = await page.evaluate(
(body) => body.innerHTML,
bodyHandle
);
const responseText = await response.text();

expect(htmlContent).toContain("Hello from the server");
expect(htmlContent).not.toContain("WebsocketServer");
expect(responseText).toContain("Hello from the server");
expect(responseText).not.toContain("WebsocketServer");

expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
"console messages"
Expand Down

0 comments on commit caa3362

Please sign in to comment.