Skip to content

Commit 2024d2f

Browse files
committed
refactor: simplify loader function by removing unnecessary return statement
1 parent 2917096 commit 2024d2f

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

src/routes/signup/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ export async function action({ request }: Route.ActionArgs) {
8787
}
8888

8989
export async function loader({ request }: Route.LoaderArgs) {
90-
const redirect = await redirectIfAuthenticated(request);
91-
return redirect;
90+
await redirectIfAuthenticated(request);
9291
}
9392

9493
export default function Signup({ actionData }: Route.ComponentProps) {

src/routes/signup/signup.loader.test.ts

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import { describe, expect, it, vi, afterEach } from "vitest";
21
import { redirect } from "react-router";
2+
import { describe, expect, it, vi, afterEach } from "vitest";
33

44
import { createTestRequest } from "@/lib/utils.tests";
55
import * as AuthService from "@/services/auth.service";
6-
import type { Route } from "./+types";
76

87
import { loader } from ".";
98

9+
import type { Route } from "./+types";
10+
1011
vi.mock("@/services/auth.service", () => ({
1112
redirectIfAuthenticated: vi.fn(),
1213
}));
@@ -21,18 +22,18 @@ describe("signup.loader", () => {
2122
const request = createTestRequest();
2223
const loaderArgs: Route.LoaderArgs = { request, params: {}, context: {} };
2324

24-
// Step 2: Mock
25+
// Step 2: Mock
2526
vi.mocked(AuthService.redirectIfAuthenticated).mockResolvedValueOnce(null);
2627

2728
// Step 3: Call/Act
28-
const result = await loader(loaderArgs);
29+
await loader(loaderArgs);
2930

3031
// Step 4: Verify/Assert
3132
expect(AuthService.redirectIfAuthenticated).toHaveBeenCalledTimes(1);
3233
expect(AuthService.redirectIfAuthenticated).toHaveBeenCalledWith(request);
3334
});
3435

35-
it("should return null when user is not authenticated", async () => {
36+
it("should return undefined when user is not authenticated", async () => {
3637
// Step 1: Setup/Arrange
3738
const request = createTestRequest();
3839
const loaderArgs: Route.LoaderArgs = { request, params: {}, context: {} };
@@ -44,7 +45,7 @@ describe("signup.loader", () => {
4445
const result = await loader(loaderArgs);
4546

4647
// Step 4: Verify/Assert
47-
expect(result).toBeNull();
48+
expect(result).toBeUndefined();
4849
});
4950

5051
it("should throw redirect when user is authenticated", async () => {
@@ -54,11 +55,13 @@ describe("signup.loader", () => {
5455
const redirectResponse = redirect("/");
5556

5657
// Step 2: Mock
57-
vi.mocked(AuthService.redirectIfAuthenticated).mockImplementationOnce(() => {
58-
throw redirectResponse;
59-
});
58+
vi.mocked(AuthService.redirectIfAuthenticated).mockImplementationOnce(
59+
() => {
60+
throw redirectResponse;
61+
}
62+
);
6063

6164
// Step 3 & 4: Call and Verify
6265
await expect(loader(loaderArgs)).rejects.toBe(redirectResponse);
6366
});
64-
});
67+
});

0 commit comments

Comments
 (0)