22541 extract breadcrumb route-state helper and align phase22 auth locale test
This commit is contained in:
@@ -21,7 +21,7 @@ const loadAuthInternals = () => {
|
||||
source = source.replace(/import[\s\S]*?from\s+"[^"]+";\n?/g, "");
|
||||
source = source.replace(
|
||||
/export default NextAuthPEDW;\s*$/,
|
||||
"module.exports = { appendParamsAndPathToNewUrl, resolveLocale, authOptions, NextAuthPEDW };"
|
||||
"module.exports = { appendParamsAndPathToNewUrl, resolveRequestLocale, authOptions, NextAuthPEDW };"
|
||||
);
|
||||
|
||||
const context = {
|
||||
@@ -68,11 +68,11 @@ const loadAuthInternals = () => {
|
||||
return context.module.exports;
|
||||
};
|
||||
|
||||
test("auth/resolveLocale prefers query then body then cookie then default", async () => {
|
||||
test("auth/resolveRequestLocale prefers query then body then cookie then default", async () => {
|
||||
const mod = loadAuthInternals();
|
||||
|
||||
assert.strictEqual(
|
||||
mod.resolveLocale({
|
||||
mod.resolveRequestLocale({
|
||||
query: { locale: "cy" },
|
||||
body: { locale: "en" },
|
||||
cookies: { pedw_locale: "en" }
|
||||
@@ -81,7 +81,7 @@ test("auth/resolveLocale prefers query then body then cookie then default", asyn
|
||||
);
|
||||
|
||||
assert.strictEqual(
|
||||
mod.resolveLocale({
|
||||
mod.resolveRequestLocale({
|
||||
body: { locale: "cy" },
|
||||
cookies: { pedw_locale: "en" }
|
||||
}),
|
||||
@@ -89,13 +89,13 @@ test("auth/resolveLocale prefers query then body then cookie then default", asyn
|
||||
);
|
||||
|
||||
assert.strictEqual(
|
||||
mod.resolveLocale({
|
||||
mod.resolveRequestLocale({
|
||||
cookies: { pedw_locale: "cy" }
|
||||
}),
|
||||
"cy"
|
||||
);
|
||||
|
||||
assert.strictEqual(mod.resolveLocale({}), "en");
|
||||
assert.strictEqual(mod.resolveRequestLocale({}), "en");
|
||||
});
|
||||
|
||||
test("auth/redirect callback keeps relative URLs on same base", async () => {
|
||||
|
||||
@@ -6,6 +6,7 @@ const runPortalServiceTests = require("./portal-service-behaviour.test.cjs");
|
||||
const runAuthRedirectSafetyTests = require("./auth-redirect-safety.test.cjs");
|
||||
const runI18nRouteParityTests = require("./i18n-route-parity.test.cjs");
|
||||
const runAzurestorageHelperTests = require("./azurestorage-helper-behaviour.test.cjs");
|
||||
const runRouteStateHelperTests = require("./route-state-helper.test.cjs");
|
||||
|
||||
const run = async () => {
|
||||
await runCoreTokenTests();
|
||||
@@ -16,6 +17,7 @@ const run = async () => {
|
||||
await runAuthRedirectSafetyTests();
|
||||
await runI18nRouteParityTests();
|
||||
await runAzurestorageHelperTests();
|
||||
await runRouteStateHelperTests();
|
||||
console.log("Phase 22 combined suite passed.");
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,139 @@
|
||||
const fs = require("fs");
|
||||
const path = require("path");
|
||||
const vm = require("vm");
|
||||
const assert = require("assert");
|
||||
|
||||
const rootDir = path.resolve(__dirname, "..", "..");
|
||||
|
||||
const loadRouteStateModule = () => {
|
||||
const filePath = path.join(rootDir, "lib", "routing", "routeState.js");
|
||||
let source = fs.readFileSync(filePath, "utf8");
|
||||
|
||||
source = source.replace(/export const\s+/g, "const ");
|
||||
source +=
|
||||
"\nmodule.exports = { normalizeRouteStateQuery, resolveSearchResultsHref };\n";
|
||||
|
||||
const context = {
|
||||
module: { exports: {} },
|
||||
exports: {},
|
||||
require
|
||||
};
|
||||
|
||||
vm.runInNewContext(source, context, { filename: filePath });
|
||||
return context.module.exports;
|
||||
};
|
||||
|
||||
const tests = [];
|
||||
const test = (name, fn) => tests.push({ name, fn });
|
||||
|
||||
test("routing/routeState normalizes va/adv/ads flags and key", async () => {
|
||||
const mod = loadRouteStateModule();
|
||||
|
||||
const normalized = mod.normalizeRouteStateQuery({
|
||||
va: "true",
|
||||
adv: "false",
|
||||
ads: "true",
|
||||
key: "myCases"
|
||||
});
|
||||
|
||||
assert.deepStrictEqual(JSON.parse(JSON.stringify(normalized)), {
|
||||
viewAll: true,
|
||||
advanced: false,
|
||||
address: true,
|
||||
key: "myCases"
|
||||
});
|
||||
});
|
||||
|
||||
test("routing/routeState resolves view-all href when va=true", async () => {
|
||||
const mod = loadRouteStateModule();
|
||||
|
||||
const href = mod.resolveSearchResultsHref({
|
||||
query: { va: "true", key: "myCases", adv: "true" },
|
||||
hasSession: true
|
||||
});
|
||||
|
||||
assert.deepStrictEqual(JSON.parse(JSON.stringify(href)), {
|
||||
pathname: "/myportal/viewall",
|
||||
query: { key: "myCases" }
|
||||
});
|
||||
});
|
||||
|
||||
test("routing/routeState resolves advanced/address/default result hrefs", async () => {
|
||||
const mod = loadRouteStateModule();
|
||||
|
||||
const advancedHref = mod.resolveSearchResultsHref({
|
||||
query: { adv: "true", q: "abc" },
|
||||
hasSession: false
|
||||
});
|
||||
const addressHref = mod.resolveSearchResultsHref({
|
||||
query: { ads: "true", q: "abc" },
|
||||
hasSession: true
|
||||
});
|
||||
const defaultHref = mod.resolveSearchResultsHref({
|
||||
query: { q: "abc" },
|
||||
hasSession: true
|
||||
});
|
||||
|
||||
assert.deepStrictEqual(JSON.parse(JSON.stringify(advancedHref)), {
|
||||
pathname: "/advancedsearchresults",
|
||||
query: { adv: "true", q: "abc" }
|
||||
});
|
||||
assert.deepStrictEqual(JSON.parse(JSON.stringify(addressHref)), {
|
||||
pathname: "/myportal/addresssearchresults",
|
||||
query: { ads: "true", q: "abc" }
|
||||
});
|
||||
assert.deepStrictEqual(JSON.parse(JSON.stringify(defaultHref)), {
|
||||
pathname: "/myportal/searchresults",
|
||||
query: { q: "abc" }
|
||||
});
|
||||
});
|
||||
|
||||
test("routing/routeState supports fallback to /myportal when no route flags", async () => {
|
||||
const mod = loadRouteStateModule();
|
||||
|
||||
const href = mod.resolveSearchResultsHref({
|
||||
query: { q: "abc" },
|
||||
hasSession: false,
|
||||
fallbackToMyPortalWhenNoFlags: true
|
||||
});
|
||||
|
||||
assert.deepStrictEqual(JSON.parse(JSON.stringify(href)), {
|
||||
pathname: "/myportal"
|
||||
});
|
||||
});
|
||||
|
||||
test("routing/routeState supports DNS route override", async () => {
|
||||
const mod = loadRouteStateModule();
|
||||
|
||||
const href = mod.resolveSearchResultsHref({
|
||||
query: { adv: "true", q: "abc" },
|
||||
hasSession: true,
|
||||
isDnsRoute: true
|
||||
});
|
||||
|
||||
assert.deepStrictEqual(JSON.parse(JSON.stringify(href)), {
|
||||
pathname: "/myportal/dnsapplications"
|
||||
});
|
||||
});
|
||||
|
||||
const run = async () => {
|
||||
let passed = 0;
|
||||
|
||||
for (const currentTest of tests) {
|
||||
await currentTest.fn();
|
||||
passed += 1;
|
||||
}
|
||||
|
||||
console.log(
|
||||
`Phase 22 route-state helper tests passed (${passed}/${tests.length}).`
|
||||
);
|
||||
};
|
||||
|
||||
module.exports = run;
|
||||
|
||||
if (require.main === module) {
|
||||
run().catch((error) => {
|
||||
console.error(error);
|
||||
process.exit(1);
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user