Skip to content

Commit 792581a

Browse files
mchwangclaude
andcommitted
Merge F6b into the #48 browser fixes
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2 parents f1d3b35 + 0857fa2 commit 792581a

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

‎test/browser/review.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -696,9 +696,9 @@ test('keeps every blocker when the click is answered with a job that ended witho
696696
await page.goto(app.url);page.on('dialog',dialog=>dialog.accept());
697697
const answered=page.waitForResponse(response=>response.url().endsWith('/api/action'));
698698
await page.getByRole('button',{name:'Merge PR',exact:true}).click();
699-
// The answer names the conflict and the check among the codes a job settles before it merges; this job never merged.
700-
const settled=(await (await answered).json()).merge.settledBeforeJobMerge;
701-
expect(settled).toEqual(expect.arrayContaining(['mergeable','check','preparation']));
699+
// This job never merged, so the codes it would have settled (served by the review, pinned in test/runner-publishing.test.ts)
700+
// stay listed.
701+
await answered;
702702
const ended=`Merge stopped. ${head.message} Merge again when ready. Refresh to see the result.`;
703703
await expect(page.locator('#banner')).toHaveText(ended);
704704
await expectEndedMergeJob(page,'Merge stopped',ended,[head.message,conflict.message,...jobResolvedBlockers.map(blocker=>blocker.message)]);

‎test/runner-publishing.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import type { PlanIdentity } from '../core/identity.ts';
2424
import { approveItem } from '../core/approvals.ts';
2525
import { GhIssueGateway, type IssueTrustGateway } from '../github/issues.ts';
2626
import type { PreMergeCoordinator } from '../runner/pre-merge.ts';
27-
import { MergeJobCoordinator, type MergeJobTiming } from '../runner/merge-job.ts';
27+
import { MergeJobCoordinator, SETTLED_BEFORE_JOB_MERGE, type MergeJobTiming } from '../runner/merge-job.ts';
2828
import type { RemoteMergeState, RequiredCheck } from '../github/merge.ts';
2929
import { RemoteTimeout } from '../github/timeout.ts';
3030
import { CommandFailed } from '../github/run-with-input.ts';
@@ -1828,6 +1828,8 @@ describe('the one-click merge job (F6b of #22)', () => {
18281828
const before = await review(served.app);
18291829
// Not prepared yet, and a required check pends: both are the job's to resolve.
18301830
expect(before.merge.blockers.map((blocker: { code: string }) => blocker.code)).toEqual(expect.arrayContaining(['preparation', 'check']));
1831+
// A runner server sends the codes a job settles before it merges, which the page drops once a job reached the merge.
1832+
expect(before.merge.settledBeforeJobMerge).toEqual([...SETTLED_BEFORE_JOB_MERGE]);
18311833
expect(before.merge).toMatchObject({ ready: true, action: 'merge', job: null });
18321834
const started = await merge(served.app, before.token);
18331835
expect(started.status).toBe(200);

0 commit comments

Comments
 (0)