Skip to content

Commit

Permalink
Fix Windows error messaging test.
Browse files Browse the repository at this point in the history
  • Loading branch information
zachleat committed Dec 6, 2024
1 parent 5d4069a commit 43919d9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/TemplatePassthroughManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class TemplatePassthroughManager {
if (src !== this.conflictMap[dest]) {
let paths = [src, this.conflictMap[dest]].sort();
throw new TemplatePassthroughManagerCopyError(
`Multiple passthrough copy files are trying to write to the same output file (${dest}). ${paths.join(" and ")}`,
`Multiple passthrough copy files are trying to write to the same output file (${TemplatePath.standardizeFilePath(dest)}). ${paths.map((p) => TemplatePath.standardizeFilePath(p)).join(" and ")}`,
);
} else {
// Multiple entries from the same source
Expand Down
2 changes: 1 addition & 1 deletion test/TemplatePassthroughManagerTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ test("Look for uniqueness on template passthrough paths #1677", async (t) => {
await t.throwsAsync(async function () {
await passthroughManager.copyAll();
}, {
message: `Multiple passthrough copy files are trying to write to the same output file (test/stubs/template-passthrough-duplicates/_site/avatar.png). test/stubs/template-passthrough-duplicates/input/avatar.png and test/stubs/template-passthrough-duplicates/input/src/views/avatar.png`
message: `Multiple passthrough copy files are trying to write to the same output file (./test/stubs/template-passthrough-duplicates/_site/avatar.png). ./test/stubs/template-passthrough-duplicates/input/avatar.png and ./test/stubs/template-passthrough-duplicates/input/src/views/avatar.png`
});

rimrafSync("test/stubs/template-passthrough-duplicates/_site/");
Expand Down

0 comments on commit 43919d9

Please sign in to comment.