Skip to content

fix(shots): site shots splice page code through jsLiteral #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antonarnaudov merged 1 commit into from
Oct 14, 2026
Merged

fix(shots): site shots splice page code through jsLiteral #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions scripts/extension-shots/site-shots.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { execFileSync } from "node:child_process";
import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
import { tmpdir } from "node:os";
import { join, resolve } from "node:path";
import { Cdp, Workbench, launchVsCode, sleep, type Rect, type Webview } from "./vscode";
import { Cdp, Workbench, jsLiteral, launchVsCode, sleep, type Rect, type Webview } from "./vscode";
import { REST, changesView, editorLine, onlyPane, openFile, openGraph, reset, rowBySubject, setBlame, showSidebar } from "./ui";

const REPO = resolve(__dirname, "../..");
Expand Down Expand Up @@ -48,7 +48,7 @@ async function typeMessage(wb: Workbench, ch: Webview, msg: string): Promise<voi
await ch.click(box, { dx: 40, dy: 12 });
await sleep(200);
await wb.typeKeys(msg);
await ch.waitFor(`${box}.value === ${JSON.stringify(msg)}`, 5_000, "the commit message");
await ch.waitFor(`${box}.value === ${jsLiteral(msg)}`, 5_000, "the commit message");
}

const GS_SCENES: Scene[] = [
Expand Down Expand Up @@ -196,7 +196,7 @@ const MS_SCENES: Scene[] = [
await sleep(2500);
// One conflict half taken (Yours in, Theirs still open), one change settled.
const press = (sel: string) =>
m.eval<boolean>(`(() => { const b = D.querySelector(${JSON.stringify(sel)}); if (!b) return false; b.dispatchEvent(new MouseEvent('mousedown', { bubbles: true, cancelable: true, button: 0 })); return true; })()`);
m.eval<boolean>(`(() => { const b = D.querySelector(${jsLiteral(sel)}); if (!b) return false; b.dispatchEvent(new MouseEvent('mousedown', { bubbles: true, cancelable: true, button: 0 })); return true; })()`);
if (!(await press('.jb-gutter-a .jb-change-actions[data-category="conflict"] .jb-btn-accept'))) throw new Error("no conflict to half take");
await sleep(800);
if (!(await press('.jb-gutter-b .jb-change-actions[data-category="theirs-only"] .jb-btn-accept')))
Expand Down
Loading