Skip to content

Commit 3b68984

Browse files
vicbvicb
committed
test(e2e): use page.waitForTimeout
1 parent 6884444 commit 3b68984

File tree

10 files changed

+27
-48
lines changed

10 files changed

+27
-48
lines changed

‎packages/tests-e2e/tests/appPagesRouter/isr.test.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { expect, test } from "@playwright/test";
22

3-
import { wait } from "../utils";
4-
53
test("Incremental Static Regeneration", async ({ page }) => {
64
test.setTimeout(60000);
75
await page.goto("/");
@@ -14,7 +12,7 @@ test("Incremental Static Regeneration", async ({ page }) => {
1412
let newTime: typeof time;
1513
let tempTime = time;
1614
do {
17-
await wait(1000);
15+
await page.waitForTimeout(1000);
1816
await page.reload();
1917
time = tempTime;
2018
el = page.getByText("Time:");
@@ -23,17 +21,17 @@ test("Incremental Static Regeneration", async ({ page }) => {
2321
} while (time !== newTime);
2422
await page.reload();
2523

26-
await wait(1000);
24+
await page.waitForTimeout(1000);
2725
el = page.getByText("Time:");
2826
const midTime = await el.textContent();
2927
// Expect that the time is still stale
3028
expect(midTime).toEqual(newTime);
3129

3230
// Wait 10 + 1 seconds for ISR to regenerate time
33-
await wait(11000);
31+
await page.waitForTimeout(11000);
3432
let finalTime = newTime;
3533
do {
36-
await wait(2000);
34+
await page.waitForTimeout(2000);
3735
el = page.getByText("Time:");
3836
finalTime = await el.textContent();
3937
await page.reload();

‎packages/tests-e2e/tests/appPagesRouter/pages_isr.test.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { expect, test } from "@playwright/test";
22

3-
import { wait } from "../utils";
4-
53
test("Incremental Static Regeneration", async ({ page }) => {
64
test.setTimeout(60000);
75
await page.goto("/");
@@ -16,25 +14,25 @@ test("Incremental Static Regeneration", async ({ page }) => {
1614
let newTime: typeof time;
1715
let tempTime = time;
1816
do {
19-
await wait(1000);
17+
await page.waitForTimeout(1000);
2018
await page.reload();
2119
time = tempTime;
2220
el = page.getByText("Time:");
2321
newTime = await el.textContent();
2422
tempTime = newTime;
2523
} while (time !== newTime);
2624
await page.reload();
27-
await wait(1000);
25+
await page.waitForTimeout(1000);
2826
el = page.getByText("Time:");
2927
const midTime = await el.textContent();
3028
// Expect that the time is still stale
3129
expect(midTime).toEqual(newTime);
3230

3331
// Wait 10 + 1 seconds for ISR to regenerate time
34-
await wait(11000);
32+
await page.waitForTimeout(11000);
3533
let finalTime = newTime;
3634
do {
37-
await wait(2000);
35+
await page.waitForTimeout(2000);
3836
el = page.getByText("Time:");
3937
finalTime = await el.textContent();
4038
await page.reload();

‎packages/tests-e2e/tests/appPagesRouter/pages_ssr.test.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { expect, test } from "@playwright/test";
22

3-
import { wait } from "../utils";
4-
53
test("Server Side Render", async ({ page }) => {
64
await page.goto("/");
75
await page.locator('[href="/pages_ssr"]').click();
@@ -24,6 +22,6 @@ test("Server Side Render", async ({ page }) => {
2422
await expect(el).toBeVisible();
2523
expect(time).not.toEqual(newTime);
2624
time = newTime;
27-
await wait(250);
25+
await page.waitForTimeout(250);
2826
}
2927
});

‎packages/tests-e2e/tests/appPagesRouter/ssr.test.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { expect, test } from "@playwright/test";
22

3-
import { wait } from "../utils";
4-
53
test("Server Side Render", async ({ page }) => {
64
await page.goto("/");
75
await page.locator('[href="/ssr"]').click();
@@ -24,7 +22,7 @@ test("Server Side Render", async ({ page }) => {
2422
await expect(el).toBeVisible();
2523
expect(time).not.toEqual(newTime);
2624
time = newTime;
27-
await wait(250);
25+
await page.waitForTimeout(250);
2826
}
2927
});
3028

‎packages/tests-e2e/tests/appRouter/isr.test.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { expect, test } from "@playwright/test";
22

3-
import { wait } from "../utils";
4-
53
test("Incremental Static Regeneration", async ({ page }) => {
64
test.setTimeout(45000);
75
await page.goto("/");
@@ -14,7 +12,7 @@ test("Incremental Static Regeneration", async ({ page }) => {
1412
let newTime: typeof time;
1513
let tempTime = time;
1614
do {
17-
await wait(1000);
15+
await page.waitForTimeout(1000);
1816
await page.reload();
1917
time = tempTime;
2018
el = page.getByText("Time:");
@@ -23,17 +21,17 @@ test("Incremental Static Regeneration", async ({ page }) => {
2321
} while (time !== newTime);
2422
await page.reload();
2523

26-
await wait(1000);
24+
await page.waitForTimeout(1000);
2725
el = page.getByText("Time:");
2826
const midTime = await el.textContent();
2927
// Expect that the time is still stale
3028
expect(midTime).toEqual(newTime);
3129

3230
// Wait 10 + 1 seconds for ISR to regenerate time
33-
await wait(11000);
31+
await page.waitForTimeout(11000);
3432
let finalTime = newTime;
3533
do {
36-
await wait(2000);
34+
await page.waitForTimeout(2000);
3735
el = page.getByText("Time:");
3836
finalTime = await el.textContent();
3937
await page.reload();
@@ -56,7 +54,7 @@ test("headers", async ({ page }) => {
5654
if (headers["cache-control"] === "max-age=10, stale-while-revalidate=999") {
5755
break;
5856
}
59-
await wait(1000);
57+
await page.waitForTimeout(1000);
6058
responsePromise = page.waitForResponse((response) => {
6159
return response.status() === 200;
6260
});

‎packages/tests-e2e/tests/appRouter/sse.test.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
import { expect, test } from "@playwright/test";
55

6-
import { wait } from "../utils";
7-
86
// NOTE: We don't await page load b/c we want to see the Loading page
97
test("Server Sent Events", async ({ page }) => {
108
await page.goto("/");
@@ -17,31 +15,31 @@ test("Server Sent Events", async ({ page }) => {
1715
// 2nd message shouldn't arrive yet
1816
let msg2 = page.getByText(`Message 2: {"message":"hello:2"`);
1917
await expect(msg2).not.toBeVisible();
20-
await wait(2000);
18+
await page.waitForTimeout(2000);
2119
// 2nd message should arrive after 2s
2220
msg2 = page.getByText(`Message 2: {"message":"hello:2"`);
2321
await expect(msg2).toBeVisible();
2422

2523
// 3rd message shouldn't arrive yet
2624
let msg3 = page.getByText(`Message 3: {"message":"hello:3"`);
2725
await expect(msg3).not.toBeVisible();
28-
await wait(2000);
26+
await page.waitForTimeout(2000);
2927
// 3rd message should arrive after 2s
3028
msg3 = page.getByText(`Message 3: {"message":"hello:3"`);
3129
await expect(msg3).toBeVisible();
3230

3331
// 4th message shouldn't arrive yet
3432
let msg4 = page.getByText(`Message 4: {"message":"hello:4"`);
3533
await expect(msg4).not.toBeVisible();
36-
await wait(2000);
34+
await page.waitForTimeout(2000);
3735
// 4th message should arrive after 2s
3836
msg4 = page.getByText(`Message 4: {"message":"hello:4"`);
3937
await expect(msg4).toBeVisible();
4038

4139
let close = page.getByText(`Message 5: {"message":"close"`);
4240
await expect(close).not.toBeVisible();
4341

44-
await wait(2000);
42+
await page.waitForTimeout(2000);
4543
close = page.getByText(`Message 5: {"message":"close"`);
4644
await expect(close).toBeVisible();
4745
});

‎packages/tests-e2e/tests/appRouter/ssr.test.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
import { expect, test } from "@playwright/test";
55

6-
import { wait } from "../utils";
7-
86
// NOTE: We don't await page load b/c we want to see the Loading page
97
test("Server Side Render and loading.tsx", async ({ page }) => {
108
test.setTimeout(600000);
@@ -25,7 +23,7 @@ test("Server Side Render and loading.tsx", async ({ page }) => {
2523
const time = await el.textContent();
2624
expect(time).not.toEqual(lastTime);
2725
lastTime = time!;
28-
await wait(1000);
26+
await page.waitForTimeout(1000);
2927
}
3028

3129
// let loading = page.getByText("Loading...");
@@ -44,7 +42,7 @@ test("Server Side Render and loading.tsx", async ({ page }) => {
4442
// await expect(el).toBeVisible();
4543
// await expect(time).not.toEqual(newTime);
4644

47-
// await wait(5000);
45+
// await page.waitForTimeout(5000);
4846
// page.reload();
4947
// loading = page.getByText("Loading...");
5048
// await expect(loading).toBeVisible();
@@ -58,7 +56,7 @@ test("Server Side Render and loading.tsx", async ({ page }) => {
5856
test("Fetch cache properly cached", async ({ page }) => {
5957
await page.goto("/ssr");
6058
const originalDate = await page.getByText("Cached fetch:").textContent();
61-
await wait(2000);
59+
await page.waitForTimeout(2000);
6260
await page.reload();
6361
const newDate = await page.getByText("Cached fetch:").textContent();
6462
expect(originalDate).toEqual(newDate);

‎packages/tests-e2e/tests/pagesRouter/isr.test.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { expect, test } from "@playwright/test";
22

3-
import { wait } from "../utils";
4-
53
test("Incremental Static Regeneration", async ({ page }) => {
64
test.setTimeout(45000);
75
await page.goto("/");
@@ -15,25 +13,25 @@ test("Incremental Static Regeneration", async ({ page }) => {
1513
let newTime: typeof time;
1614
let tempTime = time;
1715
do {
18-
await wait(1000);
16+
await page.waitForTimeout(1000);
1917
await page.reload();
2018
time = tempTime;
2119
el = page.getByText("Time:");
2220
newTime = await el.textContent();
2321
tempTime = newTime;
2422
} while (time !== newTime);
2523
await page.reload();
26-
await wait(1000);
24+
await page.waitForTimeout(1000);
2725
el = page.getByText("Time:");
2826
const midTime = await el.textContent();
2927
// Expect that the time is still stale
3028
expect(midTime).toEqual(newTime);
3129

3230
// Wait 10 + 1 seconds for ISR to regenerate time
33-
await wait(11000);
31+
await page.waitForTimeout(11000);
3432
let finalTime = newTime;
3533
do {
36-
await wait(2000);
34+
await page.waitForTimeout(2000);
3735
el = page.getByText("Time:");
3836
finalTime = await el.textContent();
3937
await page.reload();

‎packages/tests-e2e/tests/pagesRouter/ssr.test.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { expect, test } from "@playwright/test";
22

3-
import { wait } from "../utils";
4-
53
test("Server Side Render", async ({ page }) => {
64
await page.goto("/");
75
await page.locator('[href="/ssr/"]').click();
@@ -24,7 +22,7 @@ test("Server Side Render", async ({ page }) => {
2422
await expect(el).toBeVisible();
2523
expect(time).not.toEqual(newTime);
2624
time = newTime;
27-
await wait(250);
25+
await page.waitForTimeout(250);
2826
}
2927
});
3028

‎packages/tests-e2e/tests/utils.ts‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)