Compare commits

...

2 commits

Author SHA1 Message Date
danny
e73bdbbbbc PM: merge H2 flaky-test cleanup
Some checks are pending
ci / ci (macos-15) (push) Waiting to run
ci / ci (ubuntu-24.04) (push) Waiting to run
ci / ci (windows-2025) (push) Waiting to run
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-25 13:45:55 +01:00
danny
9407d5d6c2 H2: warm up first editor and modals outside the test budget
The first CodeMirror view and the first render of the editor area,
the palette and the settings dialog in a jsdom worker cost 0.3-0.6 s
once. The first test of EditorArea, language and modals paid it inside
its own 5 s budget and timed out under load. A beforeAll warm-up now
pays it once; no timeout changed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-25 13:30:57 +01:00
3 changed files with 88 additions and 16 deletions

View file

@ -7,7 +7,7 @@
*/
import { flushPromises, mount, type VueWrapper } from "@vue/test-utils";
import { createPinia, setActivePinia, type Pinia } from "pinia";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { defineComponent, h } from "vue";
const invoke = vi.hoisted(() => vi.fn());
@ -84,7 +84,8 @@ function recoveryShown(): boolean {
return document.querySelector("[data-test=recovery-dialog]") !== null;
}
beforeEach(() => {
/** Fresh Pinia and a fake engine without commands or settings. */
function resetFakeEngine(): void {
pinia = createPinia();
setActivePinia(pinia);
listeners = [];
@ -109,14 +110,37 @@ beforeEach(() => {
}
return Promise.resolve(null);
});
});
}
afterEach(() => {
/** Stops the commands and unmounts every mounted component. */
function unmountAll(): void {
useCommandsStore(pinia).stop();
for (const wrapper of mounted) {
wrapper.unmount();
}
});
}
/**
* Pays the one-time cost of the first modals outside any test: mounts the
* app's modals, opens the palette and then the settings dialog, and
* unmounts again. The first render of the palette and the settings dialog
* in a jsdom worker runs cold (about 0.3 s on an idle machine, against
* 50-100 ms later). Without this, the first test paid that cost inside its
* own 5 s budget and timed out under load.
*/
async function warmUpModals(): Promise<void> {
resetFakeEngine();
await mountApp();
await uiCommand("palette.open");
await uiCommand("settings.open");
unmountAll();
}
beforeAll(warmUpModals);
beforeEach(resetFakeEngine);
afterEach(unmountAll);
describe("one modal at a time", () => {
it("settings.open from the control channel closes the open palette", async () => {

View file

@ -11,7 +11,7 @@
import { flushPromises, mount, type VueWrapper } from "@vue/test-utils";
import { EditorView } from "@codemirror/view";
import { createPinia, setActivePinia, type Pinia } from "pinia";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
const invoke = vi.hoisted(() => vi.fn());
vi.mock("@tauri-apps/api/core", () => ({ invoke }));
@ -221,7 +221,8 @@ function stubRangeGeometry(): void {
Range.prototype.getBoundingClientRect = () => new DOMRect(0, 0, 0, 0);
}
beforeEach(() => {
/** Fresh Pinia and a fake engine with two files on its disk. */
function resetFakeEngine(): void {
stubRangeGeometry();
pinia = createPinia();
setActivePinia(pinia);
@ -244,16 +245,44 @@ beforeEach(() => {
}
return Promise.reject(new Error(`unexpected ${cmd}`));
});
});
}
afterEach(async () => {
/** Stops the global keymap and unmounts every mounted component. */
async function unmountAll(): Promise<void> {
await flushPromises();
useCommandsStore(pinia).stop();
for (const wrapper of mounted) {
wrapper.unmount();
}
mounted = [];
});
}
/**
* Pays the one-time cost of the first editor outside any test: mounts the
* editor area and the project tree, opens a file from the tree and
* unmounts again. The first CodeMirror view in a jsdom worker injects the
* base theme and runs every extension cold, and the first render of the
* Vue components is slower too (about 0.5 s together on an idle machine,
* several seconds under load). Without this, the first test that opened a
* file paid that cost inside its own 5 s budget and timed out under load.
*/
async function warmUpEditor(): Promise<void> {
resetFakeEngine();
await mountArea();
const tree = mount(ProjectToolWindow, { attachTo: document.body, global: { plugins: [pinia] } });
mounted.push(tree);
emitEngineEvent({ kind: "projectOpened", root: "/tmp/demo", name: "demo" });
await flushPromises();
await tree.find("[data-path='a.php']").trigger("dblclick");
await flushPromises();
await unmountAll();
}
beforeAll(warmUpEditor);
beforeEach(resetFakeEngine);
afterEach(unmountAll);
describe("EditorArea", () => {
it("shows the slot without tabs and opens a file from the project tree", async () => {

View file

@ -7,7 +7,7 @@
import { forceParsing, syntaxTree } from "@codemirror/language";
import { EditorState } from "@codemirror/state";
import { EditorView } from "@codemirror/view";
import { afterEach, beforeEach, describe, expect, it } from "vitest";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import { editorExtensions, lutraEditorTheme } from "../../src/components/editor/extensions";
import { languageOf, SYNTAX_TOKENS } from "../../src/components/editor/language";
@ -57,17 +57,36 @@ function highlighted(view: EditorView): Record<string, string[]> {
return out;
}
beforeEach(() => {
stubRangeGeometry();
});
afterEach(() => {
/** Destroys every view a test showed. */
function destroyViews(): void {
for (const view of views) {
view.destroy();
}
views = [];
}
/**
* Pays the one-time cost of the first highlighted PHP view outside any
* test. The first view in a jsdom worker injects CodeMirror's base theme
* and builds the PHP, HTML, CSS and JavaScript parsers cold (about 0.5 s
* on an idle machine, against 5-30 ms for later views). Without this, the
* first highlighting test paid that cost inside its own 5 s budget and
* timed out under load.
*/
function warmUpHighlighting(): void {
stubRangeGeometry();
show("a.php", '<div class="a"><?php\nfunction f(int $a): float { return $a * 1.5; }\n?></div>\n<script>let x = 1;</script>\n');
destroyViews();
}
beforeAll(warmUpHighlighting);
beforeEach(() => {
stubRangeGeometry();
});
afterEach(destroyViews);
describe("languageOf", () => {
it.each([
["src/Controller/Home.php", "php"],