@@ -38,7 +38,7 @@
>
Speeder
-
-
-
+
+
+
@@ -66,7 +66,7 @@
aria-label="Support on Ko-fi (opens in new tab)"
>
= 0; i--) {
var attr = el.attributes[i];
var name = attr.name.toLowerCase();
@@ -94,7 +94,7 @@ function vscSanitizeSvgTree(svg) {
}
});
- svg.setAttribute("xmlns", VSC_SVG_NS);
+ svg.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns", VSC_SVG_NS);
svg.setAttribute("aria-hidden", "true");
return svg;
}
diff --git a/scripts/deploy-amo-stable.sh b/scripts/deploy-amo-stable.sh
index eafd495..d70706b 100755
--- a/scripts/deploy-amo-stable.sh
+++ b/scripts/deploy-amo-stable.sh
@@ -7,19 +7,20 @@ set -euo pipefail
ROOT="$(git rev-parse --show-toplevel)"
cd "$ROOT"
+MANIFEST_PATH="extension/manifest.json"
manifest_version() {
- python3 -c 'import json; print(json.load(open("manifest.json"))["version"])'
+ MANIFEST_PATH="$MANIFEST_PATH" python3 -c 'import json, os; print(json.load(open(os.environ["MANIFEST_PATH"]))["version"])'
}
bump_manifest() {
local ver="$1"
- VER="$ver" python3 <<'PY'
+ VER="$ver" MANIFEST_PATH="$MANIFEST_PATH" python3 <<'PY'
import json
import os
ver = os.environ["VER"]
-path = "manifest.json"
+path = os.environ["MANIFEST_PATH"]
with open(path, encoding="utf-8") as f:
data = json.load(f)
data["version"] = ver
@@ -58,8 +59,8 @@ fi
git checkout beta
git pull origin beta
-echo "Current version on beta (manifest.json): $(manifest_version)"
-read -r -p "Release version for manifest.json + tag (e.g. 5.0.4): " SEMVER_IN
+echo "Current version on beta ($MANIFEST_PATH): $(manifest_version)"
+read -r -p "Release version for $MANIFEST_PATH + tag (e.g. 5.0.4): " SEMVER_IN
SEMVER="$(normalize_semver "$SEMVER_IN")"
validate_semver "$SEMVER"
@@ -73,7 +74,7 @@ fi
echo
echo "This will:"
echo " 1. checkout main, merge --squash origin/beta (single release commit on main)"
-echo " 2. set manifest.json to $SEMVER in that commit (if anything else changed, it is included too)"
+echo " 2. set $MANIFEST_PATH to $SEMVER in that commit (if anything else changed, it is included too)"
echo " 3. push origin main, create tag $TAG, push tag (triggers listed AMO submit)"
echo " 4. checkout dev (merge mainβdev yourself if you want them aligned)"
read -r -p "Continue? [y/N] " confirm
diff --git a/scripts/deploy-beta.sh b/scripts/deploy-beta.sh
index d780d33..3ccd305 100755
--- a/scripts/deploy-beta.sh
+++ b/scripts/deploy-beta.sh
@@ -6,19 +6,20 @@ set -euo pipefail
ROOT="$(git rev-parse --show-toplevel)"
cd "$ROOT"
+MANIFEST_PATH="extension/manifest.json"
manifest_version() {
- python3 -c 'import json; print(json.load(open("manifest.json"))["version"])'
+ MANIFEST_PATH="$MANIFEST_PATH" python3 -c 'import json, os; print(json.load(open(os.environ["MANIFEST_PATH"]))["version"])'
}
bump_manifest() {
local ver="$1"
- VER="$ver" python3 <<'PY'
+ VER="$ver" MANIFEST_PATH="$MANIFEST_PATH" python3 <<'PY'
import json
import os
ver = os.environ["VER"]
-path = "manifest.json"
+path = os.environ["MANIFEST_PATH"]
with open(path, encoding="utf-8") as f:
data = json.load(f)
data["version"] = ver
@@ -57,8 +58,8 @@ fi
git checkout dev
git pull origin dev
-echo "Current version in manifest.json: $(manifest_version)"
-read -r -p "New version for manifest.json (e.g. 5.0.4): " SEMVER_IN
+echo "Current version in $MANIFEST_PATH: $(manifest_version)"
+read -r -p "New version for $MANIFEST_PATH (e.g. 5.0.4): " SEMVER_IN
SEMVER="$(normalize_semver "$SEMVER_IN")"
validate_semver "$SEMVER"
@@ -76,7 +77,7 @@ fi
echo
echo "This will:"
-echo " 1. set manifest.json version to $SEMVER, commit on dev, push origin dev"
+echo " 1. set $MANIFEST_PATH version to $SEMVER, commit on dev, push origin dev"
echo " 2. checkout beta, merge dev (no-ff), push origin beta"
echo " 3. create tag $TAG and push it (triggers beta AMO + prerelease)"
echo " 4. checkout dev (main is not modified)"
@@ -86,7 +87,7 @@ read -r -p "Continue? [y/N] " confirm
echo "π Releasing beta $TAG"
bump_manifest "$SEMVER"
-git add manifest.json
+git add "$MANIFEST_PATH"
git commit -m "Bump version to $SEMVER"
git push origin dev
diff --git a/tests/helpers/extension-test-utils.js b/tests/helpers/extension-test-utils.js
index fba54f9..9bda6ad 100644
--- a/tests/helpers/extension-test-utils.js
+++ b/tests/helpers/extension-test-utils.js
@@ -1,7 +1,7 @@
const fs = require("fs");
const path = require("path");
const { JSDOM } = require("jsdom");
-const { vi } = require("vitest");
+const vi = globalThis.vi;
const ROOT = path.resolve(__dirname, "..", "..");
@@ -118,7 +118,11 @@ async function flushAsyncWork(turns) {
const count = turns || 2;
for (let i = 0; i < count; i += 1) {
await Promise.resolve();
- await new Promise((resolve) => setTimeout(resolve, 0));
+ if (vi && typeof vi.isFakeTimers === "function" && vi.isFakeTimers()) {
+ await vi.advanceTimersByTimeAsync(0);
+ } else {
+ await new Promise((resolve) => setTimeout(resolve, 0));
+ }
}
}
diff --git a/tests/importExport.integration.test.js b/tests/importExport.integration.test.js
index d1a423a..a692cb9 100644
--- a/tests/importExport.integration.test.js
+++ b/tests/importExport.integration.test.js
@@ -6,14 +6,14 @@ import {
} from "./helpers/browser.js";
async function setupImportExport(overrides = {}) {
- loadHtml("options.html");
+ loadHtml("extension/options/options.html");
globalThis.chrome = createChromeMock(overrides);
window.chrome = globalThis.chrome;
const restoreSpy = vi.fn();
globalThis.restore_options = restoreSpy;
window.restore_options = restoreSpy;
- loadScript("shared/import-export.js");
- loadScript("importExport.js");
+ loadScript("extension/shared/import-export.js");
+ loadScript("extension/options/import-export.js");
await flushAsyncWork();
return globalThis.chrome;
}
diff --git a/tests/importExport.spec.js b/tests/importExport.spec.js
index 6adc500..7cf0dec 100644
--- a/tests/importExport.spec.js
+++ b/tests/importExport.spec.js
@@ -1,8 +1,8 @@
-const { afterEach, beforeEach, describe, expect, it, vi } = require("vitest");
const {
createChromeMock,
evaluateScript,
flushAsyncWork,
+ fireDOMContentLoaded,
installCommonWindowMocks,
loadHtmlString
} = require("./helpers/extension-test-utils");
@@ -26,18 +26,38 @@ function bootImportExport(options) {
global.chrome = chrome;
window.chrome = chrome;
+ class TestBlob {
+ constructor(parts, options) {
+ this.parts = parts;
+ this.options = options;
+ }
+
+ async text() {
+ return this.parts.join("");
+ }
+ }
+ global.Blob = TestBlob;
+ window.Blob = TestBlob;
+
const createObjectURL = vi.fn(() => "blob:test");
const revokeObjectURL = vi.fn();
- vi.stubGlobal("URL", {
- createObjectURL,
- revokeObjectURL
+ Object.defineProperty(window.URL, "createObjectURL", {
+ configurable: true,
+ value: createObjectURL
});
+ Object.defineProperty(window.URL, "revokeObjectURL", {
+ configurable: true,
+ value: revokeObjectURL
+ });
+ global.URL = window.URL;
- evaluateScript("importExport.js");
+ evaluateScript("extension/shared/import-export.js");
+ evaluateScript("extension/options/import-export.js");
+ fireDOMContentLoaded();
return { chrome, createObjectURL, revokeObjectURL };
}
-describe("importExport.js", () => {
+describe("options/import-export.js", () => {
beforeEach(() => {
vi.useFakeTimers();
});
@@ -53,14 +73,15 @@ describe("importExport.js", () => {
bootImportExport();
expect(window.generateBackupFilename()).toBe(
- "speeder-backup_2026-04-04_13.14.15.json"
+ "speeder-backup_2026-04-04_09.14.15.json"
);
});
it("exports sync and local settings into a downloadable backup", async () => {
- const clickSpy = vi
- .spyOn(window.HTMLAnchorElement.prototype, "click")
- .mockImplementation(() => {});
+ Object.defineProperty(window.HTMLAnchorElement.prototype, "click", {
+ configurable: true,
+ value: vi.fn()
+ });
const { createObjectURL, revokeObjectURL } = bootImportExport({
syncData: {
rememberSpeed: true,
@@ -74,7 +95,6 @@ describe("importExport.js", () => {
});
document.querySelector("#exportSettings").click();
- await flushAsyncWork();
expect(createObjectURL).toHaveBeenCalledTimes(1);
const blob = createObjectURL.mock.calls[0][0];
@@ -82,15 +102,15 @@ describe("importExport.js", () => {
expect(backup.settings.rememberSpeed).toBe(true);
expect(backup.localSettings.customButtonIcons.faster.slug).toBe("rocket");
- expect(clickSpy).toHaveBeenCalledTimes(1);
expect(revokeObjectURL).toHaveBeenCalledWith("blob:test");
expect(document.querySelector("#status").textContent).toContain("exported");
});
it("omits Lucide tags cache from exported localSettings", async () => {
- vi.spyOn(window.HTMLAnchorElement.prototype, "click").mockImplementation(
- () => {}
- );
+ Object.defineProperty(window.HTMLAnchorElement.prototype, "click", {
+ configurable: true,
+ value: vi.fn()
+ });
const { createObjectURL } = bootImportExport({
syncData: { rememberSpeed: true },
localData: {
@@ -103,7 +123,6 @@ describe("importExport.js", () => {
});
document.querySelector("#exportSettings").click();
- await flushAsyncWork();
const blob = createObjectURL.mock.calls[0][0];
const backup = JSON.parse(await blob.text());
@@ -159,6 +178,7 @@ describe("importExport.js", () => {
}
vi.stubGlobal("FileReader", FakeFileReader);
+ window.FileReader = FakeFileReader;
document.querySelector("#importSettings").click();
await flushAsyncWork();
@@ -208,6 +228,7 @@ describe("importExport.js", () => {
}
vi.stubGlobal("FileReader", FakeFileReader);
+ window.FileReader = FakeFileReader;
document.querySelector("#importSettings").click();
await flushAsyncWork();
diff --git a/tests/inject.spec.js b/tests/inject.spec.js
index 95006f2..bd70618 100644
--- a/tests/inject.spec.js
+++ b/tests/inject.spec.js
@@ -1,4 +1,3 @@
-const { afterEach, describe, expect, it, vi } = require("vitest");
const {
createChromeMock,
evaluateScript,
@@ -31,8 +30,11 @@ function bootInject(options) {
);
window.cancelIdleCallback = (id) => clearTimeout(id);
- evaluateScript("ui-icons.js");
- evaluateScript("inject.js");
+ evaluateScript("extension/shared/controller-utils.js");
+ evaluateScript("extension/shared/key-bindings.js");
+ evaluateScript("extension/shared/site-rules.js");
+ evaluateScript("extension/shared/ui-icons.js");
+ evaluateScript("extension/content/inject.js");
return chrome;
}
@@ -116,14 +118,14 @@ describe("inject.js helper logic", () => {
bootInject();
await flushAsyncWork(3);
- window.tc.settings.siteRules = [{ pattern: "localhost", enabled: false }];
+ window.tc.settings.siteRules = [{ pattern: "example.org", enabled: false }];
window.captureSiteRuleBase();
expect(window.applySiteRuleOverrides()).toBe(true);
window.resetSettingsFromSiteRuleBase();
window.tc.settings.siteRules = [
{
- pattern: "localhost",
+ pattern: "example.org",
controllerLocation: "bottom-left",
controllerMarginTop: 300,
controllerMarginBottom: -10,
diff --git a/tests/inject.test.js b/tests/inject.test.js
index 34a5110..eb82a02 100644
--- a/tests/inject.test.js
+++ b/tests/inject.test.js
@@ -38,11 +38,11 @@ async function bootInject({ sync = {}, local = {} } = {}) {
);
globalThis.cancelIdleCallback = (id) => clearTimeout(id);
- loadScript("shared/controller-utils.js");
- loadScript("shared/key-bindings.js");
- loadScript("shared/site-rules.js");
- loadScript("ui-icons.js");
- loadScript("inject.js");
+ loadScript("extension/shared/controller-utils.js");
+ loadScript("extension/shared/key-bindings.js");
+ loadScript("extension/shared/site-rules.js");
+ loadScript("extension/shared/ui-icons.js");
+ loadScript("extension/content/inject.js");
for (let i = 0; i < 3; i += 1) {
await flushAsyncWork();
@@ -215,11 +215,11 @@ describe("inject runtime", () => {
Promise.resolve().then(() => originalLocalGet(keys, callback));
});
- loadScript("shared/controller-utils.js");
- loadScript("shared/key-bindings.js");
- loadScript("shared/site-rules.js");
- loadScript("ui-icons.js");
- loadScript("inject.js");
+ loadScript("extension/shared/controller-utils.js");
+ loadScript("extension/shared/key-bindings.js");
+ loadScript("extension/shared/site-rules.js");
+ loadScript("extension/shared/ui-icons.js");
+ loadScript("extension/content/inject.js");
// Fast-forward 3000ms for delayed rescan to trigger
vi.advanceTimersByTime(3000);
@@ -235,4 +235,3 @@ describe("inject runtime", () => {
vi.useRealTimers();
});
});
-
diff --git a/tests/lucide-client.spec.js b/tests/lucide-client.spec.js
index 4b2b050..a209141 100644
--- a/tests/lucide-client.spec.js
+++ b/tests/lucide-client.spec.js
@@ -1,4 +1,3 @@
-const { afterEach, describe, expect, it } = require("vitest");
const {
evaluateScript,
loadHtmlString
@@ -11,8 +10,8 @@ describe("lucide-client.js", () => {
it("builds icon URLs and rejects invalid slugs", () => {
loadHtmlString("");
- evaluateScript("ui-icons.js");
- evaluateScript("lucide-client.js");
+ evaluateScript("extension/shared/ui-icons.js");
+ evaluateScript("extension/options/lucide-client.js");
expect(window.lucideIconSvgUrl("alarm-clock")).toContain(
"/icons/alarm-clock.svg"
@@ -23,8 +22,8 @@ describe("lucide-client.js", () => {
it("sanitizes SVG before persisting a Lucide icon", () => {
loadHtmlString("");
- evaluateScript("ui-icons.js");
- evaluateScript("lucide-client.js");
+ evaluateScript("extension/shared/ui-icons.js");
+ evaluateScript("extension/options/lucide-client.js");
const sanitized = window.sanitizeLucideSvg(`