Skip to content

Commit a460b63

Browse files
brophdawg11brophdawg11
committed
ci: fix linting errors
1 parent 5c63fee commit a460b63

File tree

2 files changed

+72
-46
lines changed

2 files changed

+72
-46
lines changed

‎packages/react-router/lib/hooks.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import * as React from "react";
22
import {
3-
isDeferredError,
43
isRouteErrorResponse,
54
Location,
65
ParamParseKey,

‎packages/router/__tests__/router-test.ts‎

Lines changed: 72 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import type {
99
RouteMatch,
1010
Router,
1111
RouterNavigateOptions,
12+
StaticHandler,
1213
StaticHandlerContext,
1314
} from "../index";
1415
import {
@@ -9089,15 +9090,16 @@ describe("a router", () => {
90899090
},
90909091
]);
90919092
let request = createRequest("/", { signal: controller.signal });
9092-
expect.assertions(1);
9093+
let e;
90939094
try {
90949095
let contextPromise = query(request);
90959096
controller.abort();
90969097
// This should resolve even though we never resolved the loader
90979098
await contextPromise;
9098-
} catch (e) {
9099-
expect(e).toMatchInlineSnapshot(`[Error: query() call aborted]`);
9099+
} catch (_e) {
9100+
e = _e;
91009101
}
9102+
expect(e).toMatchInlineSnapshot(`[Error: query() call aborted]`);
91019103
});
91029104

91039105
it("should handle aborted submit requests", async () => {
@@ -9113,41 +9115,44 @@ describe("a router", () => {
91139115
let request = createSubmitRequest("/", {
91149116
signal: controller.signal,
91159117
});
9116-
expect.assertions(1);
9118+
let e;
91179119
try {
91189120
let contextPromise = query(request);
91199121
controller.abort();
91209122
// This should resolve even though we never resolved the loader
91219123
await contextPromise;
9122-
} catch (e) {
9123-
expect(e).toMatchInlineSnapshot(`[Error: query() call aborted]`);
9124+
} catch (_e) {
9125+
e = _e;
91249126
}
9127+
expect(e).toMatchInlineSnapshot(`[Error: query() call aborted]`);
91259128
});
91269129

91279130
it("should not support HEAD requests", async () => {
91289131
let { query } = createStaticHandler(SSR_ROUTES);
91299132
let request = createRequest("/", { method: "head" });
9130-
expect.assertions(1);
9133+
let e;
91319134
try {
91329135
await query(request);
9133-
} catch (e) {
9134-
expect(e).toMatchInlineSnapshot(
9135-
`[Error: query()/queryRoute() do not support HEAD requests]`
9136-
);
9136+
} catch (_e) {
9137+
e = _e;
91379138
}
9139+
expect(e).toMatchInlineSnapshot(
9140+
`[Error: query()/queryRoute() do not support HEAD requests]`
9141+
);
91389142
});
91399143

91409144
it("should require a signal on the request", async () => {
91419145
let { query } = createStaticHandler(SSR_ROUTES);
91429146
let request = createRequest("/", { signal: undefined });
9143-
expect.assertions(1);
9147+
let e;
91449148
try {
91459149
await query(request);
9146-
} catch (e) {
9147-
expect(e).toMatchInlineSnapshot(
9148-
`[Error: query()/queryRoute() requests must contain an AbortController signal]`
9149-
);
9150+
} catch (_e) {
9151+
e = _e;
91509152
}
9153+
expect(e).toMatchInlineSnapshot(
9154+
`[Error: query()/queryRoute() requests must contain an AbortController signal]`
9155+
);
91519156
});
91529157

91539158
it("should handle not found action submissions with a 405 error", async () => {
@@ -9181,7 +9186,9 @@ describe("a router", () => {
91819186
path: "/",
91829187
},
91839188
]);
9184-
let context = await query(createRequest("/"));
9189+
let context = (await query(
9190+
createRequest("/")
9191+
)) as StaticHandlerContext;
91859192
expect(context.statusCode).toBe(200);
91869193
});
91879194

@@ -9202,7 +9209,9 @@ describe("a router", () => {
92029209
],
92039210
},
92049211
]);
9205-
let context = await query(createRequest("/"));
9212+
let context = (await query(
9213+
createRequest("/")
9214+
)) as StaticHandlerContext;
92069215
expect(context.statusCode).toBe(500);
92079216
});
92089217

@@ -9224,7 +9233,9 @@ describe("a router", () => {
92249233
],
92259234
},
92269235
]);
9227-
let context = await query(createSubmitRequest("/?index"));
9236+
let context = (await query(
9237+
createSubmitRequest("/?index")
9238+
)) as StaticHandlerContext;
92289239
expect(context.statusCode).toBe(500);
92299240
});
92309241

@@ -9245,7 +9256,9 @@ describe("a router", () => {
92459256
],
92469257
},
92479258
]);
9248-
let context = await query(createRequest("/"));
9259+
let context = (await query(
9260+
createRequest("/")
9261+
)) as StaticHandlerContext;
92499262
expect(context.statusCode).toBe(400);
92509263
});
92519264

@@ -9267,7 +9280,9 @@ describe("a router", () => {
92679280
],
92689281
},
92699282
]);
9270-
let context = await query(createSubmitRequest("/?index"));
9283+
let context = (await query(
9284+
createSubmitRequest("/?index")
9285+
)) as StaticHandlerContext;
92719286
expect(context.statusCode).toBe(400);
92729287
});
92739288

@@ -9287,7 +9302,9 @@ describe("a router", () => {
92879302
],
92889303
},
92899304
]);
9290-
let context = await query(createSubmitRequest("/?index"));
9305+
let context = (await query(
9306+
createSubmitRequest("/?index")
9307+
)) as StaticHandlerContext;
92919308
expect(context.statusCode).toBe(203);
92929309
});
92939310

@@ -9306,12 +9323,14 @@ describe("a router", () => {
93069323
],
93079324
},
93089325
]);
9309-
let context = await query(createRequest("/"));
9326+
let context = (await query(
9327+
createRequest("/")
9328+
)) as StaticHandlerContext;
93109329
expect(context.statusCode).toBe(202);
93119330
});
93129331

93139332
it("should expose the shallowest 4xx/5xx status", async () => {
9314-
let context: StaticHandlerContext;
9333+
let context;
93159334
let query: StaticHandler["query"];
93169335

93179336
query = createStaticHandler([
@@ -9332,7 +9351,7 @@ describe("a router", () => {
93329351
],
93339352
},
93349353
]).query;
9335-
context = await query(createRequest("/"));
9354+
context = (await query(createRequest("/"))) as StaticHandlerContext;
93369355
expect(context.statusCode).toBe(400);
93379356

93389357
query = createStaticHandler([
@@ -9353,7 +9372,7 @@ describe("a router", () => {
93539372
],
93549373
},
93559374
]).query;
9356-
context = await query(createRequest("/"));
9375+
context = (await query(createRequest("/"))) as StaticHandlerContext;
93579376
expect(context.statusCode).toBe(400);
93589377

93599378
query = createStaticHandler([
@@ -9374,7 +9393,7 @@ describe("a router", () => {
93749393
],
93759394
},
93769395
]).query;
9377-
context = await query(createRequest("/"));
9396+
context = (await query(createRequest("/"))) as StaticHandlerContext;
93789397
expect(context.statusCode).toBe(400);
93799398
});
93809399
});
@@ -9395,7 +9414,9 @@ describe("a router", () => {
93959414
],
93969415
},
93979416
]);
9398-
let context = await query(createRequest("/"));
9417+
let context = (await query(
9418+
createRequest("/")
9419+
)) as StaticHandlerContext;
93999420
expect(Array.from(context.loaderHeaders.root.entries())).toEqual([
94009421
["one", "1"],
94019422
]);
@@ -9420,7 +9441,9 @@ describe("a router", () => {
94209441
],
94219442
},
94229443
]);
9423-
let context = await query(createSubmitRequest("/?index"));
9444+
let context = (await query(
9445+
createSubmitRequest("/?index")
9446+
)) as StaticHandlerContext;
94249447
expect(Array.from(context.actionHeaders.child.entries())).toEqual([
94259448
["one", "1"],
94269449
]);
@@ -9536,15 +9559,16 @@ describe("a router", () => {
95369559
let request = createRequest("/", {
95379560
signal: controller.signal,
95389561
});
9539-
expect.assertions(1);
9562+
let e;
95409563
try {
95419564
let statePromise = queryRoute(request, "root");
95429565
controller.abort();
95439566
// This should resolve even though we never resolved the loader
95449567
await statePromise;
9545-
} catch (e) {
9546-
expect(e).toMatchInlineSnapshot(`[Error: queryRoute() call aborted]`);
9568+
} catch (_e) {
9569+
e = _e;
95479570
}
9571+
expect(e).toMatchInlineSnapshot(`[Error: queryRoute() call aborted]`);
95489572
});
95499573

95509574
it("should handle aborted submit requests", async () => {
@@ -9560,41 +9584,44 @@ describe("a router", () => {
95609584
let request = createSubmitRequest("/", {
95619585
signal: controller.signal,
95629586
});
9563-
expect.assertions(1);
9587+
let e;
95649588
try {
95659589
let statePromise = queryRoute(request, "root");
95669590
controller.abort();
95679591
// This should resolve even though we never resolved the loader
95689592
await statePromise;
9569-
} catch (e) {
9570-
expect(e).toMatchInlineSnapshot(`[Error: queryRoute() call aborted]`);
9593+
} catch (_e) {
9594+
e = _e;
95719595
}
9596+
expect(e).toMatchInlineSnapshot(`[Error: queryRoute() call aborted]`);
95729597
});
95739598

95749599
it("should not support HEAD requests", async () => {
95759600
let { queryRoute } = createStaticHandler(SSR_ROUTES);
95769601
let request = createRequest("/", { method: "head" });
9577-
expect.assertions(1);
9602+
let e;
95789603
try {
95799604
await queryRoute(request, "index");
9580-
} catch (e) {
9581-
expect(e).toMatchInlineSnapshot(
9582-
`[Error: query()/queryRoute() do not support HEAD requests]`
9583-
);
9605+
} catch (_e) {
9606+
e = _e;
95849607
}
9608+
expect(e).toMatchInlineSnapshot(
9609+
`[Error: query()/queryRoute() do not support HEAD requests]`
9610+
);
95859611
});
95869612

95879613
it("should require a signal on the request", async () => {
95889614
let { queryRoute } = createStaticHandler(SSR_ROUTES);
95899615
let request = createRequest("/", { signal: undefined });
9590-
expect.assertions(1);
9616+
let e;
95919617
try {
95929618
await queryRoute(request, "index");
9593-
} catch (e) {
9594-
expect(e).toMatchInlineSnapshot(
9595-
`[Error: query()/queryRoute() requests must contain an AbortController signal]`
9596-
);
9619+
} catch (_e) {
9620+
e = _e;
95979621
}
9622+
expect(e).toMatchInlineSnapshot(
9623+
`[Error: query()/queryRoute() requests must contain an AbortController signal]`
9624+
);
95989625
});
95999626

96009627
it("should handle not found action submissions with a 405 Response", async () => {

0 commit comments

Comments
 (0)