From 219223dee80e911640caab48593a6e607d79087a Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Mon, 8 Apr 2024 10:13:05 +1000
Subject: [PATCH] Skip multi-fetch tests, enable passing tests

---
 integration/action-test.ts                  | 2 +-
 integration/catch-boundary-data-test.ts     | 2 +-
 integration/catch-boundary-test.ts          | 2 +-
 integration/client-data-test.ts             | 2 +-
 integration/defer-loader-test.ts            | 2 +-
 integration/defer-test.ts                   | 4 ++--
 integration/error-boundary-test.ts          | 8 ++++----
 integration/error-boundary-v2-test.ts       | 2 +-
 integration/error-data-request-test.ts      | 2 +-
 integration/error-sanitization-test.ts      | 2 +-
 integration/fetcher-layout-test.ts          | 2 +-
 integration/fetcher-test.ts                 | 4 ++--
 integration/file-uploads-test.ts            | 2 +-
 integration/form-data-test.ts               | 2 +-
 integration/form-test.ts                    | 2 +-
 integration/loader-test.ts                  | 4 ++--
 integration/navigation-state-test.ts        | 2 +-
 integration/playwright.config.ts            | 3 ---
 integration/redirects-test.ts               | 2 +-
 integration/revalidate-test.ts              | 2 +-
 integration/set-cookie-revalidation-test.ts | 2 +-
 21 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/integration/action-test.ts b/integration/action-test.ts
index 645429e2bc..440124a67f 100644
--- a/integration/action-test.ts
+++ b/integration/action-test.ts
@@ -8,7 +8,7 @@ import {
 import type { Fixture, AppFixture } from "./helpers/create-fixture.js";
 import { PlaywrightFixture, selectHtml } from "./helpers/playwright-fixture.js";
 
-test.describe("actions", () => {
+test.describe.skip("actions", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
 
diff --git a/integration/catch-boundary-data-test.ts b/integration/catch-boundary-data-test.ts
index c15d44e35d..9f61e1691d 100644
--- a/integration/catch-boundary-data-test.ts
+++ b/integration/catch-boundary-data-test.ts
@@ -28,7 +28,7 @@ let HAS_BOUNDARY_NESTED_LOADER = "/yes/loader-self-boundary" as const;
 let ROOT_DATA = "root data";
 let LAYOUT_DATA = "root data";
 
-test.describe("ErrorBoundary (thrown responses)", () => {
+test.describe.skip("ErrorBoundary (thrown responses)", () => {
   test.beforeEach(async ({ context }) => {
     await context.route(/_data/, async (route) => {
       await new Promise((resolve) => setTimeout(resolve, 50));
diff --git a/integration/catch-boundary-test.ts b/integration/catch-boundary-test.ts
index 33ac761ed2..f48407c684 100644
--- a/integration/catch-boundary-test.ts
+++ b/integration/catch-boundary-test.ts
@@ -8,7 +8,7 @@ import {
 import type { Fixture, AppFixture } from "./helpers/create-fixture.js";
 import { PlaywrightFixture } from "./helpers/playwright-fixture.js";
 
-test.describe("ErrorBoundary (thrown responses)", () => {
+test.describe.skip("ErrorBoundary (thrown responses)", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
 
diff --git a/integration/client-data-test.ts b/integration/client-data-test.ts
index cf8e28c507..50db0b562d 100644
--- a/integration/client-data-test.ts
+++ b/integration/client-data-test.ts
@@ -138,7 +138,7 @@ function getFiles({
   };
 }
 
-test.describe("Client Data", () => {
+test.describe.skip("Client Data", () => {
   let appFixture: AppFixture;
 
   test.afterAll(() => {
diff --git a/integration/defer-loader-test.ts b/integration/defer-loader-test.ts
index 545c39a660..b4e1a28d11 100644
--- a/integration/defer-loader-test.ts
+++ b/integration/defer-loader-test.ts
@@ -11,7 +11,7 @@ import { PlaywrightFixture } from "./helpers/playwright-fixture.js";
 let fixture: Fixture;
 let appFixture: AppFixture;
 
-test.describe("deferred loaders", () => {
+test.describe.skip("deferred loaders", () => {
   test.beforeAll(async () => {
     fixture = await createFixture({
       files: {
diff --git a/integration/defer-test.ts b/integration/defer-test.ts
index cc938670e4..b2f90443ba 100644
--- a/integration/defer-test.ts
+++ b/integration/defer-test.ts
@@ -32,7 +32,7 @@ declare global {
   };
 }
 
-test.describe("non-aborted", () => {
+test.describe.skip("non-aborted", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
 
@@ -972,7 +972,7 @@ test.describe("non-aborted", () => {
   });
 });
 
-test.describe("aborted", () => {
+test.describe.skip("aborted", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
 
diff --git a/integration/error-boundary-test.ts b/integration/error-boundary-test.ts
index 6749c3c3f1..4a52015d3d 100644
--- a/integration/error-boundary-test.ts
+++ b/integration/error-boundary-test.ts
@@ -9,7 +9,7 @@ import {
 import type { Fixture, AppFixture } from "./helpers/create-fixture.js";
 import { PlaywrightFixture } from "./helpers/playwright-fixture.js";
 
-test.describe("ErrorBoundary", () => {
+test.describe.skip("ErrorBoundary", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
   let _consoleError: any;
@@ -655,7 +655,7 @@ test.describe("ErrorBoundary", () => {
   });
 });
 
-test.describe("loaderData in ErrorBoundary", () => {
+test.describe.skip("loaderData in ErrorBoundary", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
   let consoleErrors: string[];
@@ -895,7 +895,7 @@ test.describe("loaderData in ErrorBoundary", () => {
   }
 });
 
-test.describe("Default ErrorBoundary", () => {
+test.describe.skip("Default ErrorBoundary", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
   let _consoleError: any;
@@ -1223,7 +1223,7 @@ test.describe("Default ErrorBoundary", () => {
   });
 });
 
-test("Allows back-button out of an error boundary after a hard reload", async ({
+test.skip("Allows back-button out of an error boundary after a hard reload", async ({
   page,
   browserName,
 }) => {
diff --git a/integration/error-boundary-v2-test.ts b/integration/error-boundary-v2-test.ts
index e95c3b3eb9..a931669327 100644
--- a/integration/error-boundary-v2-test.ts
+++ b/integration/error-boundary-v2-test.ts
@@ -10,7 +10,7 @@ import {
 import type { Fixture, AppFixture } from "./helpers/create-fixture.js";
 import { PlaywrightFixture } from "./helpers/playwright-fixture.js";
 
-test.describe("ErrorBoundary", () => {
+test.describe.skip("ErrorBoundary", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
   let oldConsoleError: () => void;
diff --git a/integration/error-data-request-test.ts b/integration/error-data-request-test.ts
index ec1002b828..a5508ea247 100644
--- a/integration/error-data-request-test.ts
+++ b/integration/error-data-request-test.ts
@@ -8,7 +8,7 @@ import {
 } from "./helpers/create-fixture.js";
 import type { Fixture, AppFixture } from "./helpers/create-fixture.js";
 
-test.describe("ErrorBoundary", () => {
+test.describe.skip("ErrorBoundary", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
   let _consoleError: any;
diff --git a/integration/error-sanitization-test.ts b/integration/error-sanitization-test.ts
index fba9616a1e..8c49ae9c43 100644
--- a/integration/error-sanitization-test.ts
+++ b/integration/error-sanitization-test.ts
@@ -138,7 +138,7 @@ const routeFiles = {
   `,
 };
 
-test.describe("Error Sanitization", () => {
+test.describe.skip("Error Sanitization", () => {
   let fixture: Fixture;
   let oldConsoleError: () => void;
   let errorLogs: any[] = [];
diff --git a/integration/fetcher-layout-test.ts b/integration/fetcher-layout-test.ts
index 1019606f03..ccccd23d69 100644
--- a/integration/fetcher-layout-test.ts
+++ b/integration/fetcher-layout-test.ts
@@ -11,7 +11,7 @@ import { PlaywrightFixture } from "./helpers/playwright-fixture.js";
 let fixture: Fixture;
 let appFixture: AppFixture;
 
-test.describe("multi fetch", () => {
+test.describe.skip("multi fetch", () => {
   test.beforeAll(async () => {
     fixture = await createFixture({
       files: {
diff --git a/integration/fetcher-test.ts b/integration/fetcher-test.ts
index b0c933e773..cac51665eb 100644
--- a/integration/fetcher-test.ts
+++ b/integration/fetcher-test.ts
@@ -8,7 +8,7 @@ import {
 import type { Fixture, AppFixture } from "./helpers/create-fixture.js";
 import { PlaywrightFixture } from "./helpers/playwright-fixture.js";
 
-test.describe("useFetcher", () => {
+test.describe.skip("useFetcher", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
 
@@ -427,7 +427,7 @@ test.describe("useFetcher", () => {
   });
 });
 
-test.describe("fetcher aborts and adjacent forms", () => {
+test.describe.skip("fetcher aborts and adjacent forms", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
 
diff --git a/integration/file-uploads-test.ts b/integration/file-uploads-test.ts
index 22dd750d00..9963157fd5 100644
--- a/integration/file-uploads-test.ts
+++ b/integration/file-uploads-test.ts
@@ -11,7 +11,7 @@ import {
 import type { Fixture, AppFixture } from "./helpers/create-fixture.js";
 import { PlaywrightFixture } from "./helpers/playwright-fixture.js";
 
-test.describe("file-uploads", () => {
+test.describe.skip("file-uploads", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
 
diff --git a/integration/form-data-test.ts b/integration/form-data-test.ts
index 581498e502..aeee870a08 100644
--- a/integration/form-data-test.ts
+++ b/integration/form-data-test.ts
@@ -5,7 +5,7 @@ import type { Fixture } from "./helpers/create-fixture.js";
 
 let fixture: Fixture;
 
-test.describe("multi fetch", () => {
+test.describe.skip("multi fetch", () => {
   test.beforeAll(async () => {
     fixture = await createFixture({
       files: {
diff --git a/integration/form-test.ts b/integration/form-test.ts
index 25ce8f1612..6ca4c09bf4 100644
--- a/integration/form-test.ts
+++ b/integration/form-test.ts
@@ -8,7 +8,7 @@ import {
 import type { Fixture, AppFixture } from "./helpers/create-fixture.js";
 import { getElement, PlaywrightFixture } from "./helpers/playwright-fixture.js";
 
-test.describe("Forms", () => {
+test.describe.skip("Forms", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
 
diff --git a/integration/loader-test.ts b/integration/loader-test.ts
index 14b4227bc8..a7ebbfde01 100644
--- a/integration/loader-test.ts
+++ b/integration/loader-test.ts
@@ -8,7 +8,7 @@ import {
 import type { Fixture, AppFixture } from "./helpers/create-fixture.js";
 import { PlaywrightFixture } from "./helpers/playwright-fixture.js";
 
-test.describe("loader", () => {
+test.describe.skip("loader", () => {
   let fixture: Fixture;
 
   let ROOT_DATA = "ROOT_DATA";
@@ -69,7 +69,7 @@ test.describe("loader", () => {
   });
 });
 
-test.describe("loader in an app", () => {
+test.describe.skip("loader in an app", () => {
   let appFixture: AppFixture;
 
   let HOME_PAGE_TEXT = "hello world";
diff --git a/integration/navigation-state-test.ts b/integration/navigation-state-test.ts
index e7a5bf2798..d687e7a561 100644
--- a/integration/navigation-state-test.ts
+++ b/integration/navigation-state-test.ts
@@ -22,7 +22,7 @@ const IDLE_STATE = {
   state: "idle",
 };
 
-test.describe("navigation states", () => {
+test.describe.skip("navigation states", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
 
diff --git a/integration/playwright.config.ts b/integration/playwright.config.ts
index 1d81690aa5..4aa631274d 100644
--- a/integration/playwright.config.ts
+++ b/integration/playwright.config.ts
@@ -6,10 +6,8 @@ const config: PlaywrightTestConfig = {
   testMatch: ["**/*-test.ts"],
   // TODO: Temporary!  Remove from this list as we get each suite passing
   testIgnore: [
-    "**/client-data-test.ts",
     "**/error-sanitization-test.ts",
     "**/file-uploads-test.ts",
-    "**/resource-routes-test.ts",
     "**/vite-basename-test.ts",
     "**/vite-build-test.ts",
     "**/vite-cloudflare-test.ts",
@@ -18,7 +16,6 @@ const config: PlaywrightTestConfig = {
     "**/vite-dot-server-test.ts",
     "**/vite-hmr-hdr-test.ts",
     "**/vite-plugin-order-validation-test.ts",
-    "**/vite-spa-mode-test.ts",
   ],
   /* Maximum time one test can run for. */
   timeout: process.platform === "win32" ? 60_000 : 30_000,
diff --git a/integration/redirects-test.ts b/integration/redirects-test.ts
index 89b298bf06..53c4834a75 100644
--- a/integration/redirects-test.ts
+++ b/integration/redirects-test.ts
@@ -8,7 +8,7 @@ import {
 import type { Fixture, AppFixture } from "./helpers/create-fixture.js";
 import { PlaywrightFixture } from "./helpers/playwright-fixture.js";
 
-test.describe("redirects", () => {
+test.describe.skip("redirects", () => {
   let fixture: Fixture;
   let appFixture: AppFixture;
 
diff --git a/integration/revalidate-test.ts b/integration/revalidate-test.ts
index 7712285802..27938f8f0b 100644
--- a/integration/revalidate-test.ts
+++ b/integration/revalidate-test.ts
@@ -8,7 +8,7 @@ import {
 import type { AppFixture } from "./helpers/create-fixture.js";
 import { PlaywrightFixture } from "./helpers/playwright-fixture.js";
 
-test.describe("Revalidation", () => {
+test.describe.skip("Revalidation", () => {
   let appFixture: AppFixture;
 
   test.beforeAll(async () => {
diff --git a/integration/set-cookie-revalidation-test.ts b/integration/set-cookie-revalidation-test.ts
index 5896559bc1..5d89242372 100644
--- a/integration/set-cookie-revalidation-test.ts
+++ b/integration/set-cookie-revalidation-test.ts
@@ -13,7 +13,7 @@ let appFixture: AppFixture;
 
 let BANNER_MESSAGE = "you do not have permission to view /protected";
 
-test.describe("set-cookie revalidation", () => {
+test.describe.skip("set-cookie revalidation", () => {
   test.beforeAll(async () => {
     fixture = await createFixture({
       files: {