Fix Windows tests for #3854

Author: zachleat

src/Util/GlobRemap.js

@@ -1,5 +1,10 @@
 import path from "node:path";
 import ProjectDirectories from "./ProjectDirectories.js";
+import PathNormalizer from "./PathNormalizer.js";
+
+// even on Windows (in cmd.exe) these paths are normalized to forward slashes
+// tinyglobby expects forward slashes on Windows
+const SEP = "/";
 
 class GlobRemap {
 	constructor(paths = []) {
@@ -25,7 +30,7 @@ class GlobRemap {
 
 	static getParentDirPrefix(filePath = "") {
 		let count = [];
-		for (let p of filePath.split(path.sep)) {
+		for (let p of filePath.split(SEP)) {
 			if (p === "..") {
 				count.push("..");
 			} else {
@@ -35,7 +40,7 @@ class GlobRemap {
 
 		if (count.length > 0) {
 			// trailing slash
-			return count.join(path.sep) + path.sep;
+			return count.join(SEP) + SEP;
 		}
 		return "";
 	}
@@ -62,16 +67,16 @@ class GlobRemap {
 
 	static remapInput(entry, cwd) {
 		if (cwd) {
-			if (!entry.startsWith("**" + path.sep) && !entry.startsWith(`.git${path.sep}**`)) {
-				return ProjectDirectories.getRelativeTo(entry, cwd);
+			if (!entry.startsWith("**" + SEP) && !entry.startsWith(`.git${SEP}**`)) {
+				return PathNormalizer.normalizeSeperator(ProjectDirectories.getRelativeTo(entry, cwd));
 			}
 		}
 		return entry;
 	}
 
 	static remapOutput(entry, cwd) {
 		if (cwd) {
-			return path.join(cwd, entry);
+			return PathNormalizer.normalizeSeperator(path.join(cwd, entry));
 		}
 		return entry;
 	}

test/GlobRemapTest.js.js test/GlobRemapTest.jstest/GlobRemapTest.js.js renamed to test/GlobRemapTest.js

@@ -1,7 +1,7 @@
 import test from "ava";
 import path from "node:path";
 import GlobRemap from "../src/Util/GlobRemap.js";
-import { normalizeSeparatorArray, normalizeSeparatorString } from "./Util/normalizeSeparators.js";
+import { normalizeSeparatorString } from "./Util/normalizeSeparators.js";
 
 test("getParentDirPrefix", (t) => {
   t.is(GlobRemap.getParentDirPrefix(""), "");
@@ -12,11 +12,11 @@ test("getParentDirPrefix", (t) => {
 });
 
 test("getCwd", (t) => {
-  t.is(normalizeSeparatorString(GlobRemap.getCwd([])), "");
-  t.is(normalizeSeparatorString(GlobRemap.getCwd(["test.njk"])), "");
-  t.is(normalizeSeparatorString(GlobRemap.getCwd(["./test.njk"])), "");
-  t.is(normalizeSeparatorString(GlobRemap.getCwd(["../test.njk"])), "../");
-  t.is(normalizeSeparatorString(GlobRemap.getCwd(["../test.njk", "../../2.njk"])), "../../");
+  t.is(GlobRemap.getCwd([]), "");
+  t.is(GlobRemap.getCwd(["test.njk"]), "");
+  t.is(GlobRemap.getCwd(["./test.njk"]), "");
+  t.is(GlobRemap.getCwd(["../test.njk"]), "../");
+  t.is(GlobRemap.getCwd(["../test.njk", "../../2.njk"]), "../../");
 });
 
 test("Constructor (control)", t => {
@@ -31,7 +31,7 @@ test("Constructor (control)", t => {
     'eleventy.config.js',
   ])
 
-  t.deepEqual(normalizeSeparatorArray(m.getInput()), [
+  t.deepEqual(m.getInput(), [
     '**/*.{liquid,md,njk,html,11ty.js,11ty.cjs,11ty.mjs}',
     '**/*.txt', // passthrough copy
     '**/*.png',
@@ -55,7 +55,7 @@ test("Constructor (control with ./)", t => {
     './eleventy.config.js',
   ])
 
-  t.deepEqual(normalizeSeparatorArray(m.getInput()), [
+  t.deepEqual(m.getInput(), [
     './**/*.{liquid,md,njk,html,11ty.js,11ty.cjs,11ty.mjs}',
     './**/*.txt', // passthrough copy
     './**/*.png',
@@ -80,8 +80,9 @@ test("Constructor (up one dir)", t => {
     './eleventy.config.js',
   ])
 
-  let parentDir = path.resolve("./").split(path.sep).slice(-1).join(path.sep);
-  t.deepEqual(normalizeSeparatorArray(m.getInput()), [
+  let parentDir = normalizeSeparatorString(path.resolve("./").split(path.sep).slice(-1).join(path.sep));
+
+  t.deepEqual(m.getInput(), [
     '**/*.{liquid,md,njk,html,11ty.js,11ty.cjs,11ty.mjs}',
     '**/*.txt', // passthrough copy
     '**/*.png',
@@ -107,10 +108,10 @@ test("Constructor (up two dirs)", t => {
     './eleventy.config.js',
   ])
 
-  let childDir = path.resolve("./").split(path.sep).slice(-2).join(path.sep);
-  let parentDir = path.resolve("./").split(path.sep).slice(-2, -1).join(path.sep);
+  let childDir = normalizeSeparatorString(path.resolve("./").split(path.sep).slice(-2).join(path.sep));
+  let parentDir = normalizeSeparatorString(path.resolve("./").split(path.sep).slice(-2, -1).join(path.sep));
 
-  t.deepEqual(normalizeSeparatorArray(m.getInput()), [
+  t.deepEqual(m.getInput(), [
     '**/*.{liquid,md,njk,html,11ty.js,11ty.cjs,11ty.mjs}',
     `${parentDir}/**/*.txt`, // passthrough copy
     `${parentDir}/**/*.png`,