FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

merge: resolve conflicts with main (keep cross-platform e2e) · bgColorGray/screenpipe@d39cebe · GitHub

Repository navigation

Commit d39cebe

Browse files
andcommitted
merge: resolve conflicts with main (keep cross-platform e2e)
Conflicts in lib.ts, run-all.ts, test-app-launch.ts resolved by keeping the comprehensive cross-platform version from our branch. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2 parents 872bd53 + 2c2df06 commit d39cebe

23 files changed

Lines changed: 850 additions & 156 deletions

File tree

‎.github/scripts/e2e/lib.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const IS_MACOS = platform() === "darwin";
1616

1717
// ── Config ──────────────────────────────────────────────────────────────────
1818

19-
export const APP_NAME = "screenpipe-app";
19+
export const APP_NAME = process.env.SCREENPIPE_APP_NAME ?? "screenpipe";
2020
export const HEALTH_URL = "http://localhost:3030/health";
2121
export const SEARCH_URL = "http://localhost:3030/search";
2222
export const TIMEOUT_SHORT = 5_000;
@@ -199,6 +199,7 @@ export function summary(): boolean {
199199

200200
/** Run bb CLI and return parsed JSON output */
201201
export async function bb(...args: string[]): Promise<any> {
202+
if (!BB) throw new Error("bb not available — install bigbrother CLI");
202203
const proc = Bun.spawnSync([BB, ...args]);
203204
const stdout = proc.stdout.toString().trim();
204205
if (proc.exitCode !== 0) {

‎.github/scripts/e2e/test-app-launch.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {
22
suite, test, summary, screenshot, assertHealthField,
3-
assertExists, bb, fetchJson, HEALTH_URL,
3+
assertExists, bb, fetchJson, HEALTH_URL, waitForHealth, sleep,
44
sel, IS_WINDOWS, IS_MACOS, isScreenpipeRunning,
55
} from "./lib";
66

@@ -11,8 +11,7 @@ await test("app process running", async () => {
1111
});
1212

1313
await test("health API responds", async () => {
14-
const res = await fetch("http://localhost:3030/health");
15-
if (!res.ok) throw new Error(`health returned ${res.status}`);
14+
await waitForHealth(30);
1615
});
1716

1817
await test("health frame_status ok", () => assertHealthField("frame_status", "ok"));
@@ -29,6 +28,11 @@ await test("health status acceptable", async () => {
2928
}
3029
});
3130

31+
await test("health has audio_status", async () => {
32+
const health = await fetchJson(HEALTH_URL);
33+
if (health.audio_status === undefined) throw new Error("no audio_status");
34+
});
35+
3236
if (IS_MACOS) {
3337
await test("health audio_status ok", () => assertHealthField("audio_status", "ok"));
3438

@@ -126,7 +130,7 @@ await test("concurrent API calls don't race (S9.4)", async () => {
126130
console.log(` 3 concurrent API calls: ${elapsed}ms`);
127131
});
128132

129-
await screenshot("01-tray-health");
133+
await screenshot("01-app-launch");
130134

131135
const ok = summary();
132136
process.exit(ok ? 0 : 1);

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL