normalize path

Author: jonluca

test/specs/resolvers/resolvers.spec.ts

@@ -56,6 +56,10 @@ async function withSelfSignedHttpsServer(run: (schemaUrl: string) => Promise<voi
   }
 }
 
+function normalizeWindowsDriveUrl(path: string) {
+  return path.replace(/\\/g, "/").replace(/^([A-Z]):/, (_, drive: string) => `${drive.toLowerCase()}:`);
+}
+
 describe("options.resolve", () => {
   it('should not resolve external links if "resolve.external" is disabled', async () => {
     const schema = await $RefParser.dereference(path.abs("test/specs/resolvers/resolvers.yaml"), {
@@ -338,9 +342,10 @@ describe("options.resolve", () => {
             order: 1,
             canRead: true,
             read(file: FileInfo) {
-              seenUrls.push(file.url);
+              const normalizedUrl = normalizeWindowsDriveUrl(file.url);
+              seenUrls.push(normalizedUrl);
 
-              const remote = remotes[file.url];
+              const remote = remotes[normalizedUrl];
               if (remote === undefined) {
                 throw new Error(`Unexpected file URL: ${file.url}`);
               }

test/specs/special-characters-files/special-characters-files.spec.ts

@@ -4,25 +4,30 @@ import path from "../../utils/path.js";
 
 const isBrowser = typeof window !== "undefined";
 
+function normalizePathForAssertion(entry: string) {
+  return decodeURIComponent(entry)
+    .replace(/\\/g, "/")
+    .replace(/^file:\/\/\/([A-Z]):/, (_match, drive: string) => `file:///${drive.toLowerCase()}:`)
+    .replace(/^([A-Z]):/, (_match, drive: string) => `${drive.toLowerCase()}:`);
+}
+
 describe.skipIf(isBrowser)("Special-character file paths", () => {
   // Adapted replacement for the repo's previously ignored filename regression, using
   // a cross-platform-safe subset of special characters.
   const schemaPath = path.rel(
     "test/specs/special-characters-files/dir with [brackets] & spaces/root schema.yaml",
   );
-  const nestedPath = path.abs(
-    "test/specs/special-characters-files/dir with [brackets] & spaces/defs [value] %.json",
-  );
 
   it("should resolve external refs from filenames with spaces and special characters", async () => {
     const parser = new $RefParser();
     const $refs = await parser.resolve(schemaPath);
-    const resolvedPath = $refs.paths().find((entry) => entry.includes("defs [value] %.json"));
     const values = $refs.values();
+    const resolvedEntry = Object.entries(values).find(([entry]) =>
+      normalizePathForAssertion(entry).includes("defs [value] %.json"),
+    );
 
-    expect($refs.paths()).toContain(nestedPath);
-    expect(resolvedPath).toBeTruthy();
-    expect(values[resolvedPath as string]).toEqual({
+    expect(resolvedEntry).toBeTruthy();
+    expect(resolvedEntry?.[1]).toEqual({
       definitions: {
         value: {
           type: "object",
@@ -32,7 +37,7 @@ describe.skipIf(isBrowser)("Special-character file paths", () => {
         },
       },
     });
-    expect(values[resolvedPath as string].definitions.value).toEqual({
+    expect((resolvedEntry?.[1] as any).definitions.value).toEqual({
       type: "object",
       properties: {
         name: { type: "string" },