Merge branch 'main' into fix/sweep-stale-e2e-orgs-secret-name
All checks were successful
sop-tier-check / tier-check (pull_request) bypass
Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 15s
CI / Detect changes (pull_request) Successful in 37s
E2E Staging Canvas (Playwright) / detect-changes (pull_request) Successful in 35s
E2E API Smoke Test / detect-changes (pull_request) Successful in 38s
Handlers Postgres Integration / detect-changes (pull_request) Successful in 39s
Runtime PR-Built Compatibility / detect-changes (pull_request) Successful in 35s
CI / Platform (Go) (pull_request) Successful in 5s
CI / Shellcheck (E2E scripts) (pull_request) Successful in 4s
CI / Canvas (Next.js) (pull_request) Successful in 6s
CI / Python Lint & Test (pull_request) Successful in 5s
Secret scan / Scan diff for credential-shaped strings (pull_request) bypass
Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Successful in 6s
E2E API Smoke Test / E2E API Smoke Test (pull_request) Successful in 9s
E2E Staging Canvas (Playwright) / Canvas tabs E2E (pull_request) Successful in 9s
Runtime PR-Built Compatibility / PR-built wheel + import smoke (pull_request) Successful in 6s
CI / Canvas Deploy Reminder (pull_request) Has been skipped
audit-force-merge / audit (pull_request) Successful in 27s
All checks were successful
sop-tier-check / tier-check (pull_request) bypass
Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 15s
CI / Detect changes (pull_request) Successful in 37s
E2E Staging Canvas (Playwright) / detect-changes (pull_request) Successful in 35s
E2E API Smoke Test / detect-changes (pull_request) Successful in 38s
Handlers Postgres Integration / detect-changes (pull_request) Successful in 39s
Runtime PR-Built Compatibility / detect-changes (pull_request) Successful in 35s
CI / Platform (Go) (pull_request) Successful in 5s
CI / Shellcheck (E2E scripts) (pull_request) Successful in 4s
CI / Canvas (Next.js) (pull_request) Successful in 6s
CI / Python Lint & Test (pull_request) Successful in 5s
Secret scan / Scan diff for credential-shaped strings (pull_request) bypass
Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Successful in 6s
E2E API Smoke Test / E2E API Smoke Test (pull_request) Successful in 9s
E2E Staging Canvas (Playwright) / Canvas tabs E2E (pull_request) Successful in 9s
Runtime PR-Built Compatibility / PR-built wheel + import smoke (pull_request) Successful in 6s
CI / Canvas Deploy Reminder (pull_request) Has been skipped
audit-force-merge / audit (pull_request) Successful in 27s
This commit is contained in:
commit
3cbbfc714c
@ -41,9 +41,10 @@ const pendingApproval = (id = "a1", workspaceId = "ws-1"): {
|
|||||||
created_at: "2026-05-10T10:00:00Z",
|
created_at: "2026-05-10T10:00:00Z",
|
||||||
});
|
});
|
||||||
|
|
||||||
// Shared spy reference so individual tests can call mockGet.mockRestore()
|
// Shared spy references so individual tests can reset or reject the POST mock
|
||||||
// without needing to pass it through beforeEach → it scope chain.
|
// without needing to call spyOn again (which would create a duplicate spy).
|
||||||
let mockGet: ReturnType<typeof vi.spyOn>;
|
let mockGet: ReturnType<typeof vi.spyOn>;
|
||||||
|
let mockPost: ReturnType<typeof vi.spyOn>;
|
||||||
|
|
||||||
// ─── Tests ────────────────────────────────────────────────────────────────────
|
// ─── Tests ────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
@ -139,8 +140,8 @@ describe("ApprovalBanner — renders approval cards", () => {
|
|||||||
describe("ApprovalBanner — decisions", () => {
|
describe("ApprovalBanner — decisions", () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vi.useFakeTimers();
|
vi.useFakeTimers();
|
||||||
vi.spyOn(api, "get").mockResolvedValueOnce([pendingApproval("a1")]);
|
mockGet = vi.spyOn(api, "get").mockResolvedValueOnce([pendingApproval("a1")]);
|
||||||
vi.spyOn(api, "post").mockResolvedValue({});
|
mockPost = vi.spyOn(api, "post").mockResolvedValue({});
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
@ -196,7 +197,7 @@ describe("ApprovalBanner — decisions", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("shows an error toast when POST fails", async () => {
|
it("shows an error toast when POST fails", async () => {
|
||||||
vi.mocked(api.post).mockRejectedValueOnce(new Error("Network error"));
|
mockPost.mockReset().mockRejectedValue(new Error("Network error"));
|
||||||
render(<ApprovalBanner />);
|
render(<ApprovalBanner />);
|
||||||
await act(async () => { await vi.runOnlyPendingTimersAsync(); });
|
await act(async () => { await vi.runOnlyPendingTimersAsync(); });
|
||||||
fireEvent.click(screen.getAllByRole("button", { name: /approve/i })[0]);
|
fireEvent.click(screen.getAllByRole("button", { name: /approve/i })[0]);
|
||||||
@ -208,8 +209,9 @@ describe("ApprovalBanner — decisions", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("keeps the card visible when the POST fails", async () => {
|
it("keeps the card visible when the POST fails", async () => {
|
||||||
// Use mockRejectedValueOnce on the same spy as beforeEach (don't call spyOn again)
|
// Reset the post mock before rejecting so the beforeEach's resolved value
|
||||||
vi.mocked(api.post).mockRejectedValueOnce(new Error("Network error"));
|
// is gone and we get a clean rejection instead of a resolved→rejected queue.
|
||||||
|
mockPost.mockReset().mockRejectedValue(new Error("Network error"));
|
||||||
render(<ApprovalBanner />);
|
render(<ApprovalBanner />);
|
||||||
await act(async () => { await vi.runOnlyPendingTimersAsync(); });
|
await act(async () => { await vi.runOnlyPendingTimersAsync(); });
|
||||||
fireEvent.click(screen.getAllByRole("button", { name: /approve/i })[0]);
|
fireEvent.click(screen.getAllByRole("button", { name: /approve/i })[0]);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user