Skip to content

Commit 2251a2e

Browse files
committed
fix(test-runner): unresolved placeholders
fix: #167
1 parent 943a5b4 commit 2251a2e

3 files changed

Lines changed: 14 additions & 13 deletions

File tree

src/core/tester/test-bundler-template/index.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import mochaSetupRaw from "./raw/mocha-setup.js?raw";
66

77
export function generateManifest(): Record<string, unknown> {
88
const manifestStr = manifestRaw
9-
.replace("__TESTER_PLUGIN_ID__", TESTER_PLUGIN_ID);
9+
.replaceAll("__TESTER_PLUGIN_ID__", TESTER_PLUGIN_ID);
1010

1111
return JSON.parse(manifestStr);
1212
}
@@ -17,10 +17,10 @@ export function generateBootstrap(options: {
1717
waitForPlugin: string;
1818
}): string {
1919
return bootstrapRaw
20-
.replace("__PORT__", String(options.port))
21-
.replace("__STARTUP_DELAY__", String(options.startupDelay || 1000))
22-
.replace("__WAIT_FOR_PLUGIN__", options.waitForPlugin)
23-
.replace("__TESTER_PLUGIN_REF__", TESTER_PLUGIN_REF);
20+
.replaceAll("__PORT__", String(options.port))
21+
.replaceAll("__STARTUP_DELAY__", String(options.startupDelay || 1000))
22+
.replaceAll("__WAIT_FOR_PLUGIN__", options.waitForPlugin)
23+
.replaceAll("__TESTER_PLUGIN_REF__", TESTER_PLUGIN_REF);
2424
}
2525

2626
export function generateHtml(
@@ -29,7 +29,9 @@ export function generateHtml(
2929
): string {
3030
const tests = testFiles.map(f => `<script src="${f}"></script>`).join("\n ");
3131

32-
return htmlRaw.replace("__TEST_FILES__", tests).replace("___SETUP_CODE___", setupCode);
32+
return htmlRaw
33+
.replaceAll("__TEST_FILES__", tests)
34+
.replaceAll("__SETUP_CODE__", setupCode);
3335
}
3436

3537
export function generateMochaSetup(options: {
@@ -39,8 +41,8 @@ export function generateMochaSetup(options: {
3941
exitOnFinish: boolean;
4042
}): string {
4143
return mochaSetupRaw
42-
.replace("__TIMEOUT__", String(options.timeout || 10000))
43-
.replace("__PORT__", String(options.port))
44-
.replace("__ABORT_ON_FAIL__", String(options.abortOnFail))
45-
.replace("__EXIT_ON_FINISH__", String(options.exitOnFinish ? "true" : "false"));
44+
.replaceAll("__TIMEOUT__", String(options.timeout || 10000))
45+
.replaceAll("__PORT__", String(options.port))
46+
.replaceAll("__ABORT_ON_FAIL__", String(options.abortOnFail))
47+
.replaceAll("__EXIT_ON_FINISH__", String(options.exitOnFinish ? "true" : "false"));
4648
}

src/core/tester/test-bundler-template/raw/bootstrap.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ async function launchTests() {
5555
// Delay to allow plugin to fully load before opening the test page
5656
await Zotero.Promise.delay(__STARTUP_DELAY__);
5757

58-
const waitForPlugin = "${WAIT_FOR_PLUGIN}";
58+
const waitForPlugin = "__WAIT_FOR_PLUGIN__";
5959

6060
if (waitForPlugin) {
6161
// Wait for a plugin to be installed
@@ -72,7 +72,7 @@ async function launchTests() {
7272

7373
Services.ww.openWindow(
7474
null,
75-
"chrome://${TESTER_PLUGIN_REF}/content/index.xhtml",
75+
"chrome://__TESTER_PLUGIN_REF__/content/index.xhtml",
7676
"Zotero Plugin Scaffold Test Runnner",
7777
"chrome,centerscreen,resizable=yes",
7878
{}

src/core/tester/test-bundler-template/raw/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<!-- Generated by zotero-plugin-scaffold -->
2-
<!doctype html>
32
<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
43
<head>
54
<meta charset="UTF-8" />

0 commit comments

Comments
 (0)