Skip to content

Commit cd37d79

Browse files
Fix RSC client data tests (#14060)
1 parent fcbf6e6 commit cd37d79

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

integration/client-data-test.ts

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -155,20 +155,20 @@ test.describe("Client Data", () => {
155155

156156
test.describe(`template: ${templateName}`, () => {
157157
[true, false].forEach((splitRouteModules) => {
158-
test.skip(
159-
templateName === "rsc-parcel-framework" && splitRouteModules,
160-
"RSC Data Mode doesn't support splitRouteModules",
161-
);
162-
163-
test.skip(
164-
({ browserName }) =>
165-
Boolean(process.env.CI) &&
166-
splitRouteModules &&
167-
(browserName === "webkit" || process.platform === "win32"),
168-
"Webkit/Windows tests only run on a single worker in CI and splitRouteModules is not OS/browser-specific",
169-
);
170-
171158
test.describe(`splitRouteModules: ${splitRouteModules}`, () => {
159+
test.skip(
160+
templateName.includes("rsc") && splitRouteModules,
161+
"RSC Framework Mode doesn't support splitRouteModules",
162+
);
163+
164+
test.skip(
165+
({ browserName }) =>
166+
Boolean(process.env.CI) &&
167+
splitRouteModules &&
168+
(browserName === "webkit" || process.platform === "win32"),
169+
"Webkit/Windows tests only run on a single worker in CI and splitRouteModules is not OS/browser-specific",
170+
);
171+
172172
test.describe("clientLoader - critical route module", () => {
173173
test("no client loaders or fallbacks", async ({ page }) => {
174174
appFixture = await createAppFixture(
@@ -546,8 +546,8 @@ test.describe("Client Data", () => {
546546
page,
547547
}) => {
548548
test.skip(
549-
templateName === "rsc-parcel-framework",
550-
"RSC Data Mode doesn't need to provide a default root HydrateFallback since it doesn't need to ensure <Scripts /> is rendered, and you already get a console warning",
549+
templateName.includes("rsc"),
550+
"RSC Framework Mode doesn't need to provide a default root HydrateFallback since it doesn't need to ensure <Scripts /> is rendered, and you already get a console warning",
551551
);
552552

553553
appFixture = await createAppFixture(
@@ -927,14 +927,9 @@ test.describe("Client Data", () => {
927927
// Ignore any dev tools messages. This may only happen locally when dev
928928
// tools is installed and not in CI but either way we don't care
929929
/Download the React DevTools/.test(text) ||
930-
(templateName === "rsc-parcel-framework" &&
930+
(templateName.includes("rsc") &&
931931
/The <Scripts \/> element is a no-op when using RSC and can be safely removed./.test(
932932
text,
933-
)) ||
934-
// TODO: Render outlet on RSC render error?
935-
(templateName === "rsc-parcel-framework" &&
936-
/Matched leaf route at location "\/parent\/child" does not have an element/.test(
937-
text,
938933
))
939934
) {
940935
return;
@@ -963,6 +958,11 @@ test.describe("Client Data", () => {
963958
test("hydrating clientLoader redirects trigger new .data requests to the server", async ({
964959
page,
965960
}) => {
961+
test.fixme(
962+
templateName.includes("rsc"),
963+
"Not working in the RSC implementation",
964+
);
965+
966966
appFixture = await createAppFixture(
967967
await createFixture({
968968
templateName,
@@ -1185,8 +1185,8 @@ test.describe("Client Data", () => {
11851185
browserName,
11861186
}) => {
11871187
test.skip(
1188-
templateName === "rsc-parcel-framework",
1189-
"This test is specific to non-RSC Data Mode",
1188+
templateName.includes("rsc"),
1189+
"This test is specific to non-RSC Framework Mode",
11901190
);
11911191

11921192
appFixture = await createAppFixture(

0 commit comments

Comments
 (0)