Skip to content

Address ao update test review comments #2068

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

Closed
suraj-markup wants to merge 2 commits into from
+16 −13
Closed

Address ao update test review comments #2068

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
002a037
Address update script test review
suraj-markup May 26, 2026
82ae6b8
Ensure update script test cleans temp dir
suraj-markup May 26, 2026
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
29 changes: 16 additions & 13 deletions packages/cli/__tests__/scripts/update-script.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { dirname, join, resolve } from "node:path";
import { tmpdir } from "node:os";
import { spawnSync } from "node:child_process";
import { fileURLToPath } from "node:url";
import { isWindows } from "@aoagents/ao-core";

const packageRoot = resolve(dirname(fileURLToPath(import.meta.url)), "../..");
const scriptPath = join(packageRoot, "src", "assets", "scripts", "ao-update.sh");
Expand Down Expand Up @@ -92,7 +93,7 @@ esac\nexit 0`,
// Bash-script tests skipped on Windows: spawnSync("bash", ...) requires bash
// which isn't guaranteed without Git for Windows. The Windows code path uses
// detectWindowsBash() at runtime, exercised separately.
it.skipIf(process.platform === "win32")(
it.skipIf(isWindows())(
"syncs the fork with upstream via gh and fast-forwards the local checkout from upstream",
() => {
const tempRoot = mkdtempSync(join(tmpdir(), "ao-update-upstream-script-"));
Expand Down Expand Up @@ -162,7 +163,7 @@ esac\nexit 0`,
},
);

it.skipIf(process.platform === "win32")("uses forced npm link so stale global ao shims are overwritten", () => {
it.skipIf(isWindows())("uses forced npm link so stale global ao shims are overwritten", () => {
const tempRoot = mkdtempSync(join(tmpdir(), "ao-update-stale-shim-"));
const fakeRepo = join(tempRoot, "repo");
mkdirSync(join(fakeRepo, "packages", "cli"), { recursive: true });
Expand Down Expand Up @@ -228,7 +229,7 @@ exit 0`,
expect(result.stdout).not.toContain("Permission denied");
});

it.skipIf(process.platform === "win32")("runs the built-in smoke commands in smoke-only mode", () => {
it.skipIf(isWindows())("runs the built-in smoke commands in smoke-only mode", () => {
const tempRoot = mkdtempSync(join(tmpdir(), "ao-update-smoke-"));
const fakeRepo = join(tempRoot, "repo");
mkdirSync(join(fakeRepo, "packages", "ao", "bin"), { recursive: true });
Expand Down Expand Up @@ -269,7 +270,7 @@ exit 0`,
);
});

it.skipIf(process.platform === "win32")(
it.skipIf(isWindows())(
"resolves the source checkout root when AO_REPO_ROOT is unset",
() => {
const tempRoot = mkdtempSync(join(tmpdir(), "ao-update-root-detect-"));
Expand All @@ -295,14 +296,16 @@ exit 0`,
encoding: "utf8",
});

const commands = readFileSync(commandLog, "utf8");
rmSync(tempRoot, { recursive: true, force: true });

const repoRoot = resolve(packageRoot, "../..");
expect(result.status).toBe(0);
expect(commands).toContain(
`node ${join(repoRoot, "packages", "ao", "bin", "ao.js")} --version`,
);
try {
const repoRoot = resolve(packageRoot, "../..");
expect(result.status, result.stderr || result.stdout).toBe(0);
const commands = readFileSync(commandLog, "utf8");
expect(commands).toContain(
`node ${join(repoRoot, "packages", "ao", "bin", "ao.js")} --version`,
);
} finally {
rmSync(tempRoot, { recursive: true, force: true });
}
},
);

Expand Down Expand Up @@ -352,7 +355,7 @@ exit 0`,
expect(result.stderr).toContain("commit or stash");
});

it.skipIf(process.platform === "win32")("skips rebuild but still runs smoke tests when local HEAD matches remote HEAD", () => {
it.skipIf(isWindows())("skips rebuild but still runs smoke tests when local HEAD matches remote HEAD", () => {
const tempRoot = mkdtempSync(join(tmpdir(), "ao-update-already-latest-"));
const fakeRepo = join(tempRoot, "repo");
mkdirSync(join(fakeRepo, "packages", "cli"), { recursive: true });
Expand Down