fix flakey ISR tests (#204)

* fix flakey ISR tests
sst · Aug 31, 2023 · 85fc07a · 85fc07a
1 parent 40c338a
commit 85fc07a
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 46 deletions.
diff --git a/packages/tests-e2e/tests/appPagesRouter/isr.test.ts b/packages/tests-e2e/tests/appPagesRouter/isr.test.ts
@@ -22,18 +22,21 @@ test("Incremental Static Regeneration", async ({ page }) => {
   } while (time !== newTime);
   await page.reload();
 
+  await wait(1000);
   el = page.getByText("ISR");
-  newTime = await el.textContent();
+  const midTime = await el.textContent();
+  // Expect that the time is still stale
+  expect(midTime).toEqual(newTime);
 
-  // Wait 10 seconds for ISR to regenerate time
-  await wait(10000);
-  await page.reload();
-  await wait(5000);
-  await page.reload();
-  await wait(5000);
-  await page.reload();
-  el = page.getByText("ISR");
-  newTime = await el.textContent();
+  // Wait 10 + 1 seconds for ISR to regenerate time
+  await wait(11000);
+  let finalTime = newTime;
+  do {
+    await wait(2000);
+    el = page.getByText("ISR");
+    finalTime = await el.textContent();
+    await page.reload();
+  } while (newTime === finalTime);
 
-  expect(time).not.toEqual(newTime);
+  expect(newTime).not.toEqual(finalTime);
 });
diff --git a/packages/tests-e2e/tests/appPagesRouter/pages_isr.test.ts b/packages/tests-e2e/tests/appPagesRouter/pages_isr.test.ts
@@ -23,19 +23,21 @@ test("Incremental Static Regeneration", async ({ page }) => {
     tempTime = newTime;
   } while (time !== newTime);
   await page.reload();
-
+  await wait(1000);
   el = page.getByText("ISR");
-  newTime = await el.textContent();
+  const midTime = await el.textContent();
+  // Expect that the time is still stale
+  expect(midTime).toEqual(newTime);
 
-  // Wait 10 seconds for ISR to regenerate time
-  await wait(15000);
-  await page.reload();
-  await wait(5000);
-  await page.reload();
-  await wait(5000);
-  await page.reload();
-  el = page.getByText("ISR");
-  newTime = await el.textContent();
+  // Wait 10 + 1 seconds for ISR to regenerate time
+  await wait(11000);
+  let finalTime = newTime;
+  do {
+    await wait(2000);
+    el = page.getByText("ISR");
+    finalTime = await el.textContent();
+    await page.reload();
+  } while (newTime === finalTime);
 
-  expect(time).not.toEqual(newTime);
+  expect(newTime).not.toEqual(finalTime);
 });
diff --git a/packages/tests-e2e/tests/appRouter/isr.test.ts b/packages/tests-e2e/tests/appRouter/isr.test.ts
@@ -22,18 +22,21 @@ test("Incremental Static Regeneration", async ({ page }) => {
   } while (time !== newTime);
   await page.reload();
 
+  await wait(1000);
   el = page.getByText("ISR");
-  newTime = await el.textContent();
+  const midTime = await el.textContent();
+  // Expect that the time is still stale
+  expect(midTime).toEqual(newTime);
 
-  // Wait 10 seconds for ISR to regenerate time
-  await wait(15000);
-  await page.reload();
-  await wait(5000);
-  await page.reload();
-  await wait(5000);
-  await page.reload();
-  el = page.getByText("ISR");
-  newTime = await el.textContent();
+  // Wait 10 + 1 seconds for ISR to regenerate time
+  await wait(11000);
+  let finalTime = newTime;
+  do {
+    await wait(2000);
+    el = page.getByText("ISR");
+    finalTime = await el.textContent();
+    await page.reload();
+  } while (newTime === finalTime);
 
-  expect(time).not.toEqual(newTime);
+  expect(newTime).not.toEqual(finalTime);
 });
diff --git a/packages/tests-e2e/tests/pagesRouter/isr.test.ts b/packages/tests-e2e/tests/pagesRouter/isr.test.ts
@@ -22,19 +22,21 @@ test("Incremental Static Regeneration", async ({ page }) => {
     tempTime = newTime;
   } while (time !== newTime);
   await page.reload();
-
+  await wait(1000);
   el = page.getByText("ISR");
-  newTime = await el.textContent();
+  const midTime = await el.textContent();
+  // Expect that the time is still stale
+  expect(midTime).toEqual(newTime);
 
-  // Wait 10 seconds for ISR to regenerate time
-  await wait(15000);
-  await page.reload();
-  await wait(5000);
-  await page.reload();
-  await wait(5000);
-  await page.reload();
-  el = page.getByText("ISR");
-  newTime = await el.textContent();
+  // Wait 10 + 1 seconds for ISR to regenerate time
+  await wait(11000);
+  let finalTime = newTime;
+  do {
+    await wait(2000);
+    el = page.getByText("ISR");
+    finalTime = await el.textContent();
+    await page.reload();
+  } while (newTime === finalTime);
 
-  expect(time).not.toEqual(newTime);
+  expect(newTime).not.toEqual(finalTime);
 });