test(mvp0): complete remaining i18n, RBAC, and CRUD coverage
This commit is contained in:
17
apps/admin/src/i18n/server.test.ts
Normal file
17
apps/admin/src/i18n/server.test.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
import { describe, expect, it } from "vitest"
|
||||
|
||||
import { resolveAdminLocaleFromCookieValue } from "./server"
|
||||
|
||||
describe("resolveAdminLocaleFromCookieValue", () => {
|
||||
it("accepts supported locales", () => {
|
||||
expect(resolveAdminLocaleFromCookieValue("de")).toBe("de")
|
||||
expect(resolveAdminLocaleFromCookieValue("en")).toBe("en")
|
||||
expect(resolveAdminLocaleFromCookieValue("es")).toBe("es")
|
||||
expect(resolveAdminLocaleFromCookieValue("fr")).toBe("fr")
|
||||
})
|
||||
|
||||
it("falls back to default locale for unknown values", () => {
|
||||
expect(resolveAdminLocaleFromCookieValue("it")).toBe("en")
|
||||
expect(resolveAdminLocaleFromCookieValue(undefined)).toBe("en")
|
||||
})
|
||||
})
|
||||
@@ -4,10 +4,7 @@ import { cookies } from "next/headers"
|
||||
import type { AdminMessages } from "./messages"
|
||||
import { ADMIN_LOCALE_COOKIE } from "./shared"
|
||||
|
||||
export async function resolveAdminLocale(): Promise<AppLocale> {
|
||||
const cookieStore = await cookies()
|
||||
const value = cookieStore.get(ADMIN_LOCALE_COOKIE)?.value
|
||||
|
||||
export function resolveAdminLocaleFromCookieValue(value: string | undefined): AppLocale {
|
||||
if (value && isAppLocale(value)) {
|
||||
return value
|
||||
}
|
||||
@@ -15,6 +12,12 @@ export async function resolveAdminLocale(): Promise<AppLocale> {
|
||||
return defaultLocale
|
||||
}
|
||||
|
||||
export async function resolveAdminLocale(): Promise<AppLocale> {
|
||||
const cookieStore = await cookies()
|
||||
const value = cookieStore.get(ADMIN_LOCALE_COOKIE)?.value
|
||||
return resolveAdminLocaleFromCookieValue(value)
|
||||
}
|
||||
|
||||
export async function getAdminMessages(locale: AppLocale): Promise<AdminMessages> {
|
||||
return (await import(`../messages/${locale}.json`)).default as AdminMessages
|
||||
}
|
||||
|
||||
17
apps/web/src/i18n/request.test.ts
Normal file
17
apps/web/src/i18n/request.test.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
import { describe, expect, it } from "vitest"
|
||||
|
||||
import { resolveRequestLocale } from "./request"
|
||||
|
||||
describe("resolveRequestLocale", () => {
|
||||
it("accepts supported locales", () => {
|
||||
expect(resolveRequestLocale("de")).toBe("de")
|
||||
expect(resolveRequestLocale("en")).toBe("en")
|
||||
expect(resolveRequestLocale("es")).toBe("es")
|
||||
expect(resolveRequestLocale("fr")).toBe("fr")
|
||||
})
|
||||
|
||||
it("falls back to default locale for unsupported values", () => {
|
||||
expect(resolveRequestLocale("it")).toBe("en")
|
||||
expect(resolveRequestLocale(undefined)).toBe("en")
|
||||
})
|
||||
})
|
||||
@@ -1,11 +1,16 @@
|
||||
import type { AppLocale } from "@cms/i18n"
|
||||
import { hasLocale } from "next-intl"
|
||||
import { getRequestConfig } from "next-intl/server"
|
||||
|
||||
import { routing } from "./routing"
|
||||
|
||||
export function resolveRequestLocale(requested: string | undefined): AppLocale {
|
||||
return hasLocale(routing.locales, requested) ? requested : routing.defaultLocale
|
||||
}
|
||||
|
||||
export default getRequestConfig(async ({ requestLocale }) => {
|
||||
const requested = await requestLocale
|
||||
const locale = hasLocale(routing.locales, requested) ? requested : routing.defaultLocale
|
||||
const locale = resolveRequestLocale(requested)
|
||||
|
||||
return {
|
||||
locale,
|
||||
|
||||
Reference in New Issue
Block a user