mirror of
https://github.com/stablyai/orca.git
synced 2026-10-30 16:47:34 +00:00
* refactor(tests): split oversized test files off the max-lines suppression list Every `*.test.ts`/`*.spec.ts` that carried an `eslint/oxlint-disable max-lines` directive is now split into focused, behavior-scoped suites that fit the 800-line test budget, with shared setup extracted into co-located `*-test-harness.ts` / `*-test-fixtures.ts` modules (300-line budget). 83 files became ~930; the largest output is 797 effective lines. `orca-runtime.test.ts` is intentionally untouched. Test bodies were moved by scripted line-range slicing rather than retyped, so assertions are byte-identical. The only permitted body edits were mechanical rebinding where a shared value moved into a harness (e.g. `tmpHome` -> `homes.tmpHome`). Registries that enumerate test files were updated in lockstep: - config/max-lines-baseline.txt: pruned 341 -> 258 entries (all 83 removed). - config/reliability-gates.jsonc: 33 gates repointed at the split files, with assertionRefs split per file where a gate's coverage now spans several. - .github/workflows/pr.yml: the real-zsh lane now lists the 4 split files that actually exercise zsh, so they keep running in the dedicated shell lane. Also renamed agent-hooks `server-test-fixtures.ts` to `server.test-fixtures.ts` so the global-fetch call-site audit keeps skipping it, and added `.js` extensions to the CLI suites' dynamic harness imports (node16 resolution) to unbreak `build:cli`. Verification: full suite 52,449 passing vs 52,448 at baseline with zero assertions lost; `pnpm lint`, `pnpm typecheck`, and `pnpm build:cli` all exit 0; the terminal-pane e2e spec runs 31/31 headless. * refactor(tests): split hook-idle arbitration suite that oxfmt pushed over budget The pre-commit oxfmt pass reflowed pty-connection-hook-idle-arbitration.test.ts to 811 effective lines, 11 over the test budget. Split the hook-completion side effect and replacement-agent veto cases into their own suite; both files now sit well under the cap and the 15 tests are unchanged. * test: port upstream test changes into the split files after rebase Rebasing onto main surfaced 27 tests that main had added to files this branch deleted, plus edits to tests that had already moved. Taking the deletion side of those modify/delete conflicts would have dropped that coverage silently, so each upstream change is ported into the split file that now owns the behavior — for example main's six orchestration mailbox tests land across orchestration-runs, -send, and -check. Also repoints `orchestration.notification-mailbox-consistency`, a gate main added after this branch's gate remap, at those same three split files, and re-prunes the max-lines baseline against main's (257 entries). Verified: all 27 upstream test titles present; full suite 52,761 passing with the only diff vs baseline being 12 tests main itself removed and 3 that moved from skipped to passing; lint and typecheck exit 0. * fix(test): flush pending continuations before tearing down terminal test globals CI shard 5/16 failed on both Node 24 and 26 with `ReferenceError: window is not defined` from pty-connection.ts, surfacing through pty-connection-daemon-snapshot-replay.test.ts. The reattach/settle chains `await` a real promise and then touch `window.api`. Under fake timers those continuations cannot run, so they only become schedulable once restoreTerminalTestGlobals() switches back to real timers — which previously happened immediately before `delete globalThis.window`, so a late continuation threw and failed the whole file. Flush async ticks in that window instead. This is latent in the source rather than new: the pre-split 25k-line file kept running other tests after these, which gave the chains time to settle before teardown. Splitting the file moved teardown directly behind them. * fix(test): keep an inert window after terminal test teardown instead of deleting it The async-tick flush was not enough: the reattach/settle chain can resolve after teardown regardless of how long we drain, so CI shard 5/16 still failed with `ReferenceError: window is not defined` from pty-connection.ts. A real renderer never loses `window`, so deleting it was the artificial part. Swap in an inert proxy whose properties resolve to callables and whose calls resolve to undefined, making a late `window.api.pty.*` call a harmless no-op. The next test replaces it wholesale via installTerminalTestGlobals(), and no test asserts that `window` is absent.
645 lines
21 KiB
TypeScript
645 lines
21 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import type * as GithubApiRepositoryModule from './github-api-repository'
|
|
import type * as GitHubEnterpriseRepositoryModule from './github-enterprise-repository'
|
|
|
|
const { clientMocks, moduleMocks } = await vi.hoisted(async () => {
|
|
const moduleMocks = await import('./client-test-mocks')
|
|
return { clientMocks: moduleMocks.createGitHubClientMocks(), moduleMocks }
|
|
})
|
|
|
|
vi.mock('./gh-utils', () => moduleMocks.ghUtilsModuleMock(clientMocks))
|
|
vi.mock('../git/runner', () => moduleMocks.gitRunnerModuleMock(clientMocks))
|
|
vi.mock('../providers/ssh-git-dispatch', () => moduleMocks.sshGitDispatchModuleMock(clientMocks))
|
|
vi.mock('./local-git-config-signature', () =>
|
|
moduleMocks.localGitConfigSignatureModuleMock(clientMocks)
|
|
)
|
|
vi.mock('./github-enterprise-repository', async (importOriginal) =>
|
|
moduleMocks.githubEnterpriseRepositoryModuleMock(
|
|
await importOriginal<typeof GitHubEnterpriseRepositoryModule>()
|
|
)
|
|
)
|
|
vi.mock('./rate-limit', () => moduleMocks.rateLimitModuleMock(clientMocks))
|
|
vi.mock('./github-api-repository', async (importOriginal) =>
|
|
moduleMocks.githubApiRepositoryModuleMock(
|
|
clientMocks,
|
|
await importOriginal<typeof GithubApiRepositoryModule>()
|
|
)
|
|
)
|
|
|
|
import {
|
|
getPRForBranch,
|
|
getWorkItemByOwnerRepo,
|
|
mergePR,
|
|
resolveReviewThread,
|
|
setPRAutoMerge,
|
|
updatePRTitle,
|
|
_getMergeQueueCacheSizeForTests
|
|
} from './client'
|
|
import { resetGraphQLRateLimitGuardMocks } from './client-test-harness'
|
|
|
|
const {
|
|
ghExecFileAsyncMock,
|
|
getOwnerRepoMock,
|
|
resolvePRRepositoryCandidatesMock,
|
|
gitExecFileAsyncMock,
|
|
rateLimitGuardMock,
|
|
noteRateLimitSpendMock,
|
|
acquireMock
|
|
} = clientMocks
|
|
|
|
describe('GitHub GraphQL rate-limit guard', () => {
|
|
beforeEach(() => {
|
|
resetGraphQLRateLimitGuardMocks(clientMocks)
|
|
})
|
|
|
|
afterEach(() => vi.restoreAllMocks())
|
|
|
|
it('uses explicit PR repo for merge and title mutations', async () => {
|
|
ghExecFileAsyncMock
|
|
.mockResolvedValueOnce({
|
|
stdout: JSON.stringify({
|
|
number: 7,
|
|
title: 'PR',
|
|
state: 'open',
|
|
head: { ref: 'feature', sha: 'head-oid' },
|
|
base: { ref: 'main', sha: 'base-oid' },
|
|
stack: null
|
|
})
|
|
})
|
|
.mockResolvedValueOnce({
|
|
stdout: JSON.stringify({
|
|
number: 7,
|
|
title: 'PR',
|
|
state: 'OPEN',
|
|
url: 'https://github.com/stablyai/orca/pull/7',
|
|
statusCheckRollup: [],
|
|
updatedAt: '2026-04-01T00:00:00Z',
|
|
isDraft: false,
|
|
mergeable: 'MERGEABLE',
|
|
baseRefName: 'main',
|
|
baseRefOid: 'base-oid',
|
|
headRefOid: 'head-oid'
|
|
})
|
|
})
|
|
.mockResolvedValue({ stdout: '', stderr: '' })
|
|
|
|
await expect(
|
|
mergePR('/repo-root', 7, 'squash', undefined, {
|
|
owner: 'stablyai',
|
|
repo: 'orca',
|
|
host: 'github.com'
|
|
})
|
|
).resolves.toEqual({ ok: true })
|
|
await expect(
|
|
updatePRTitle('/repo-root', 7, 'New title', undefined, {
|
|
owner: 'stablyai',
|
|
repo: 'orca',
|
|
host: 'github.com'
|
|
})
|
|
).resolves.toBe(true)
|
|
|
|
expect(getOwnerRepoMock).not.toHaveBeenCalled()
|
|
expect(ghExecFileAsyncMock).toHaveBeenNthCalledWith(1, ['api', 'repos/stablyai/orca/pulls/7'], {
|
|
cwd: '/repo-root',
|
|
host: 'github.com'
|
|
})
|
|
expect(ghExecFileAsyncMock).toHaveBeenNthCalledWith(
|
|
2,
|
|
[
|
|
'pr',
|
|
'view',
|
|
'7',
|
|
'--repo',
|
|
'stablyai/orca',
|
|
'--json',
|
|
'number,title,state,url,statusCheckRollup,updatedAt,isDraft,mergeable,reviewDecision,mergeStateStatus,autoMergeRequest,baseRefName,headRefName,baseRefOid,headRefOid'
|
|
],
|
|
{ cwd: '/repo-root', host: 'github.com' }
|
|
)
|
|
expect(ghExecFileAsyncMock).toHaveBeenNthCalledWith(
|
|
3,
|
|
['pr', 'merge', '7', '--squash', '--repo', 'stablyai/orca'],
|
|
expect.objectContaining({
|
|
cwd: '/repo-root',
|
|
env: expect.objectContaining({ GH_PROMPT_DISABLED: '1' }),
|
|
host: 'github.com'
|
|
})
|
|
)
|
|
expect(ghExecFileAsyncMock).toHaveBeenNthCalledWith(
|
|
4,
|
|
['pr', 'edit', '7', '--title', 'New title', '--repo', 'stablyai/orca'],
|
|
{ cwd: '/repo-root', host: 'github.com' }
|
|
)
|
|
})
|
|
|
|
it('sets and disables PR auto-merge with explicit PR repos and SSH context', async () => {
|
|
ghExecFileAsyncMock
|
|
.mockResolvedValueOnce({ stdout: JSON.stringify({ stack: null }) })
|
|
.mockResolvedValueOnce({
|
|
stdout: JSON.stringify({ id: 'PR_kwDO123', headRefOid: 'head-oid' })
|
|
})
|
|
.mockResolvedValue({ stdout: '', stderr: '' })
|
|
|
|
await expect(
|
|
setPRAutoMerge('/remote/repo-root', 7, true, 'squash', 'ssh-1', {
|
|
owner: 'stablyai',
|
|
repo: 'orca',
|
|
host: 'github.com'
|
|
})
|
|
).resolves.toEqual({ ok: true })
|
|
await expect(
|
|
setPRAutoMerge('/remote/repo-root', 7, false, 'squash', 'ssh-1', {
|
|
owner: 'stablyai',
|
|
repo: 'orca',
|
|
host: 'github.com'
|
|
})
|
|
).resolves.toEqual({ ok: true })
|
|
|
|
expect(ghExecFileAsyncMock).toHaveBeenNthCalledWith(1, ['api', 'repos/stablyai/orca/pulls/7'], {
|
|
host: 'github.com'
|
|
})
|
|
expect(ghExecFileAsyncMock).toHaveBeenNthCalledWith(
|
|
2,
|
|
['pr', 'view', '7', '--json', 'id,headRefOid,baseRefName', '--repo', 'stablyai/orca'],
|
|
{ host: 'github.com' }
|
|
)
|
|
expect(ghExecFileAsyncMock).toHaveBeenNthCalledWith(
|
|
3,
|
|
expect.arrayContaining([
|
|
'api',
|
|
'graphql',
|
|
'-f',
|
|
'pullRequestId=PR_kwDO123',
|
|
'-f',
|
|
'mergeMethod=SQUASH',
|
|
'-f',
|
|
'expectedHeadOid=head-oid'
|
|
]),
|
|
expect.objectContaining({
|
|
env: expect.objectContaining({ GH_PROMPT_DISABLED: '1' }),
|
|
host: 'github.com'
|
|
})
|
|
)
|
|
expect(ghExecFileAsyncMock).toHaveBeenNthCalledWith(
|
|
4,
|
|
['pr', 'merge', '7', '--disable-auto', '--repo', 'stablyai/orca'],
|
|
expect.objectContaining({
|
|
env: expect.objectContaining({ GH_PROMPT_DISABLED: '1' }),
|
|
host: 'github.com'
|
|
})
|
|
)
|
|
expect(ghExecFileAsyncMock.mock.calls[0]?.[1]).not.toHaveProperty('cwd')
|
|
})
|
|
|
|
it('enables auto-merge without invoking the direct merge command', async () => {
|
|
ghExecFileAsyncMock
|
|
.mockResolvedValueOnce({ stdout: JSON.stringify({ stack: null }) })
|
|
.mockResolvedValueOnce({
|
|
stdout: JSON.stringify({ id: 'PR_kwDO123', headRefOid: 'head-oid' })
|
|
})
|
|
.mockResolvedValue({ stdout: '', stderr: '' })
|
|
|
|
await expect(
|
|
setPRAutoMerge('/repo-root', 7, true, 'squash', undefined, {
|
|
owner: 'stablyai',
|
|
repo: 'orca',
|
|
host: 'github.com'
|
|
})
|
|
).resolves.toEqual({ ok: true })
|
|
|
|
expect(
|
|
ghExecFileAsyncMock.mock.calls.some((call) =>
|
|
(call[0] as string[]).some((arg) => arg.includes('enablePullRequestAutoMerge'))
|
|
)
|
|
).toBe(true)
|
|
expect(
|
|
ghExecFileAsyncMock.mock.calls.some(
|
|
(call) =>
|
|
call[0][0] === 'pr' && call[0][1] === 'merge' && (call[0] as string[]).includes('--auto')
|
|
)
|
|
).toBe(false)
|
|
})
|
|
|
|
it('rejects auto-merge for GitHub-registered stacks', async () => {
|
|
ghExecFileAsyncMock.mockResolvedValueOnce({
|
|
stdout: JSON.stringify({
|
|
number: 202,
|
|
title: 'Stack API',
|
|
state: 'open',
|
|
head: { ref: 'stack/api', sha: 'head-oid' },
|
|
base: { ref: 'stack/models', sha: 'models-sha' },
|
|
stack: {
|
|
number: 51,
|
|
position: 2,
|
|
size: 2,
|
|
base: { ref: 'main', sha: 'main-sha' }
|
|
}
|
|
})
|
|
})
|
|
|
|
await expect(
|
|
setPRAutoMerge('/repo-root', 202, true, 'squash', undefined, {
|
|
owner: 'stablyai',
|
|
repo: 'orca',
|
|
host: 'github.com'
|
|
})
|
|
).resolves.toEqual({
|
|
ok: false,
|
|
error: 'GitHub does not support auto-merge for stacked pull requests.'
|
|
})
|
|
expect(ghExecFileAsyncMock).toHaveBeenCalledTimes(1)
|
|
})
|
|
|
|
it('translates the GitHub clean-status rejection into an actionable message', async () => {
|
|
ghExecFileAsyncMock
|
|
.mockResolvedValueOnce({ stdout: JSON.stringify({ stack: null }) })
|
|
.mockResolvedValueOnce({
|
|
stdout: JSON.stringify({ id: 'PR_kwDO123', headRefOid: 'head-oid' })
|
|
})
|
|
.mockRejectedValueOnce(new Error('GraphQL: Pull request is in clean status'))
|
|
|
|
await expect(
|
|
setPRAutoMerge('/repo-root', 7, true, 'squash', undefined, {
|
|
owner: 'stablyai',
|
|
repo: 'orca',
|
|
host: 'github.com'
|
|
})
|
|
).resolves.toEqual({
|
|
ok: false,
|
|
error: 'This pull request can already be merged. Use Merge instead of auto-merge.'
|
|
})
|
|
})
|
|
|
|
it('uses the queue-aware gh merge path when the base branch has a merge queue', async () => {
|
|
ghExecFileAsyncMock
|
|
.mockResolvedValueOnce({ stdout: JSON.stringify({ stack: null }) })
|
|
.mockResolvedValueOnce({
|
|
stdout: JSON.stringify({ id: 'PR_kwDO123', headRefOid: 'head-oid', baseRefName: 'main' })
|
|
})
|
|
.mockResolvedValueOnce({
|
|
stdout: JSON.stringify({ data: { repository: { mergeQueue: { id: 'MQ_kw' } } } })
|
|
})
|
|
.mockResolvedValue({ stdout: '', stderr: '' })
|
|
|
|
await expect(
|
|
setPRAutoMerge('/repo-root', 7, true, 'squash', undefined, {
|
|
owner: 'stablyai',
|
|
repo: 'orca',
|
|
host: 'github.com'
|
|
})
|
|
).resolves.toEqual({ ok: true })
|
|
|
|
expect(ghExecFileAsyncMock).toHaveBeenNthCalledWith(
|
|
3,
|
|
expect.arrayContaining(['api', 'graphql', '-f', 'branch=main']),
|
|
{ cwd: '/repo-root', host: 'github.com' }
|
|
)
|
|
expect(ghExecFileAsyncMock).toHaveBeenNthCalledWith(
|
|
4,
|
|
['pr', 'merge', '7', '--auto', '--squash', '--repo', 'stablyai/orca'],
|
|
expect.objectContaining({
|
|
cwd: '/repo-root',
|
|
env: expect.objectContaining({ GH_PROMPT_DISABLED: '1' }),
|
|
host: 'github.com'
|
|
})
|
|
)
|
|
expect(
|
|
ghExecFileAsyncMock.mock.calls.some((call) =>
|
|
(call[0] as string[]).some((arg) => arg.includes('enablePullRequestAutoMerge'))
|
|
)
|
|
).toBe(false)
|
|
})
|
|
|
|
it('blocks direct merge when GitHub reports required approval', async () => {
|
|
ghExecFileAsyncMock
|
|
.mockResolvedValueOnce({ stdout: JSON.stringify({ stack: null }) })
|
|
.mockResolvedValueOnce({
|
|
stdout: JSON.stringify({
|
|
number: 7,
|
|
title: 'PR',
|
|
state: 'OPEN',
|
|
url: 'https://github.com/stablyai/orca/pull/7',
|
|
statusCheckRollup: [],
|
|
updatedAt: '2026-04-01T00:00:00Z',
|
|
isDraft: false,
|
|
mergeable: 'MERGEABLE',
|
|
reviewDecision: 'REVIEW_REQUIRED',
|
|
mergeStateStatus: 'CLEAN',
|
|
autoMergeRequest: null,
|
|
baseRefName: 'main',
|
|
baseRefOid: 'base-oid',
|
|
headRefOid: 'head-oid'
|
|
})
|
|
})
|
|
|
|
await expect(
|
|
mergePR('/repo-root', 7, 'squash', undefined, {
|
|
owner: 'stablyai',
|
|
repo: 'orca',
|
|
host: 'github.com'
|
|
})
|
|
).resolves.toEqual({
|
|
ok: false,
|
|
error: 'This pull request requires review approval before it can be merged.'
|
|
})
|
|
|
|
expect(ghExecFileAsyncMock).toHaveBeenCalledTimes(3)
|
|
expect(ghExecFileAsyncMock.mock.calls[2]?.[0]).toContain('graphql')
|
|
})
|
|
|
|
it('detects merge queues once per base branch and blocks direct merges', async () => {
|
|
const prView = {
|
|
number: 7,
|
|
title: 'PR',
|
|
state: 'OPEN',
|
|
url: 'https://github.com/stablyai/orca/pull/7',
|
|
statusCheckRollup: [],
|
|
updatedAt: '2026-04-01T00:00:00Z',
|
|
isDraft: false,
|
|
mergeable: 'MERGEABLE',
|
|
reviewDecision: 'APPROVED',
|
|
mergeStateStatus: 'CLEAN',
|
|
autoMergeRequest: null,
|
|
baseRefName: 'true',
|
|
baseRefOid: 'base-oid',
|
|
headRefOid: 'head-oid'
|
|
}
|
|
ghExecFileAsyncMock
|
|
.mockResolvedValueOnce({ stdout: JSON.stringify({ stack: null }) })
|
|
.mockResolvedValueOnce({ stdout: JSON.stringify(prView) })
|
|
.mockResolvedValueOnce({
|
|
stdout: JSON.stringify({ data: { repository: { mergeQueue: { id: 'MQ_kw' } } } })
|
|
})
|
|
.mockResolvedValueOnce({ stdout: JSON.stringify({ stack: null }) })
|
|
.mockResolvedValueOnce({ stdout: JSON.stringify(prView) })
|
|
|
|
await expect(
|
|
mergePR('/repo-root', 7, 'squash', undefined, {
|
|
owner: 'stablyai',
|
|
repo: 'orca',
|
|
host: 'github.com'
|
|
})
|
|
).resolves.toEqual({
|
|
ok: false,
|
|
error:
|
|
'This pull request must be merged through GitHub merge queue. Use Merge when ready instead.'
|
|
})
|
|
await expect(
|
|
mergePR('/repo-root', 7, 'squash', undefined, { owner: 'stablyai', repo: 'orca' })
|
|
).resolves.toMatchObject({ ok: false })
|
|
|
|
expect(
|
|
ghExecFileAsyncMock.mock.calls.filter((call) => call[0].includes('graphql'))
|
|
).toHaveLength(1)
|
|
expect(ghExecFileAsyncMock.mock.calls[2]?.[0]).toEqual(
|
|
expect.arrayContaining(['-f', 'owner=stablyai', '-f', 'repo=orca', '-f', 'branch=true'])
|
|
)
|
|
expect(ghExecFileAsyncMock.mock.calls[2]?.[0]).not.toContain('-F')
|
|
})
|
|
|
|
it('caches unknown merge queue probes after GraphQL failures', async () => {
|
|
getOwnerRepoMock.mockResolvedValue({ owner: 'stablyai', repo: 'orca' })
|
|
const prView = {
|
|
number: 7,
|
|
title: 'PR',
|
|
state: 'OPEN',
|
|
url: 'https://github.com/stablyai/orca/pull/7',
|
|
statusCheckRollup: [],
|
|
updatedAt: '2026-04-01T00:00:00Z',
|
|
isDraft: false,
|
|
mergeable: 'MERGEABLE',
|
|
reviewDecision: 'APPROVED',
|
|
mergeStateStatus: 'CLEAN',
|
|
autoMergeRequest: null,
|
|
baseRefName: 'main',
|
|
baseRefOid: 'base-oid',
|
|
headRefOid: 'head-oid'
|
|
}
|
|
ghExecFileAsyncMock
|
|
.mockResolvedValueOnce({ stdout: JSON.stringify(prView) })
|
|
.mockRejectedValueOnce(new Error('network is down'))
|
|
.mockResolvedValueOnce({ stdout: '{}' })
|
|
.mockResolvedValueOnce({ stdout: JSON.stringify(prView) })
|
|
.mockResolvedValueOnce({ stdout: '{}' })
|
|
|
|
await expect(getPRForBranch('/repo-root', 'feature/test', 7)).resolves.toMatchObject({
|
|
mergeQueueRequired: null
|
|
})
|
|
await expect(getPRForBranch('/repo-root', 'feature/test', 7)).resolves.toMatchObject({
|
|
mergeQueueRequired: null
|
|
})
|
|
|
|
expect(
|
|
ghExecFileAsyncMock.mock.calls.filter((call) => call[0].includes('graphql'))
|
|
).toHaveLength(1)
|
|
})
|
|
|
|
it('bounds merge metadata cache entries across many base branches', async () => {
|
|
getOwnerRepoMock.mockResolvedValue({ owner: 'stablyai', repo: 'orca' })
|
|
let prViewCount = 0
|
|
ghExecFileAsyncMock.mockImplementation(async (args) => {
|
|
if (args.includes('graphql')) {
|
|
return { stdout: JSON.stringify({ data: { repository: { mergeQueue: null } } }) }
|
|
}
|
|
prViewCount += 1
|
|
return {
|
|
stdout: JSON.stringify({
|
|
number: prViewCount,
|
|
title: 'PR',
|
|
state: 'OPEN',
|
|
url: `https://github.com/stablyai/orca/pull/${prViewCount}`,
|
|
statusCheckRollup: [],
|
|
updatedAt: '2026-04-01T00:00:00Z',
|
|
isDraft: false,
|
|
mergeable: 'MERGEABLE',
|
|
reviewDecision: 'APPROVED',
|
|
mergeStateStatus: 'CLEAN',
|
|
autoMergeRequest: null,
|
|
baseRefName: `base-${prViewCount}`,
|
|
baseRefOid: 'base-oid',
|
|
headRefOid: 'head-oid'
|
|
})
|
|
}
|
|
})
|
|
|
|
for (let i = 0; i < 260; i++) {
|
|
await getPRForBranch('/repo-root', `feature/${i}`, i + 1)
|
|
}
|
|
|
|
expect(_getMergeQueueCacheSizeForTests()).toBe(256)
|
|
})
|
|
|
|
it('isolates merge metadata for the same slug on different GitHub hosts', async () => {
|
|
resolvePRRepositoryCandidatesMock.mockResolvedValue({
|
|
candidates: [
|
|
{ owner: 'acme', repo: 'widgets', host: 'github.com' },
|
|
{ owner: 'acme', repo: 'widgets', host: 'github.acme-corp.com' }
|
|
],
|
|
headRepo: { owner: 'acme', repo: 'widgets', host: 'github.com' }
|
|
})
|
|
const prView = {
|
|
number: 7,
|
|
title: 'PR',
|
|
state: 'OPEN',
|
|
url: 'https://github.com/acme/widgets/pull/7',
|
|
statusCheckRollup: [],
|
|
updatedAt: '2026-07-16T00:00:00Z',
|
|
isDraft: false,
|
|
mergeable: 'MERGEABLE',
|
|
baseRefName: 'main',
|
|
headRefOid: 'head-oid'
|
|
}
|
|
ghExecFileAsyncMock.mockImplementation(async (args, options) => {
|
|
if (args.includes('graphql')) {
|
|
const enterprise = options?.host === 'github.acme-corp.com'
|
|
return {
|
|
stdout: JSON.stringify({
|
|
data: {
|
|
repository: {
|
|
mergeQueue: null,
|
|
autoMergeAllowed: !enterprise
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
return { stdout: JSON.stringify(prView) }
|
|
})
|
|
|
|
const githubDotCom = await getWorkItemByOwnerRepo(
|
|
'/repo-root',
|
|
{ owner: 'acme', repo: 'widgets', host: 'github.com' },
|
|
7,
|
|
'pr'
|
|
)
|
|
const enterprise = await getWorkItemByOwnerRepo(
|
|
'/repo-root',
|
|
{ owner: 'acme', repo: 'widgets', host: 'github.acme-corp.com' },
|
|
7,
|
|
'pr'
|
|
)
|
|
|
|
expect(githubDotCom?.autoMergeAllowed).toBe(true)
|
|
expect(enterprise?.autoMergeAllowed).toBe(false)
|
|
const graphqlCalls = ghExecFileAsyncMock.mock.calls.filter(([args]) => args.includes('graphql'))
|
|
expect(graphqlCalls).toHaveLength(2)
|
|
expect(graphqlCalls[1]?.[1]).toEqual(expect.objectContaining({ host: 'github.acme-corp.com' }))
|
|
})
|
|
|
|
it('rejects explicit work-item lookups outside configured repository candidates', async () => {
|
|
resolvePRRepositoryCandidatesMock.mockResolvedValueOnce({
|
|
candidates: [{ owner: 'acme', repo: 'widgets', host: 'github.com' }],
|
|
headRepo: { owner: 'acme', repo: 'widgets', host: 'github.com' }
|
|
})
|
|
|
|
await expect(
|
|
getWorkItemByOwnerRepo(
|
|
'/repo-root',
|
|
{ owner: 'victim', repo: 'secrets', host: 'evil.example.test' },
|
|
7,
|
|
'pr'
|
|
)
|
|
).resolves.toBeNull()
|
|
|
|
expect(acquireMock).not.toHaveBeenCalled()
|
|
expect(ghExecFileAsyncMock).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('returns conflicting file details instead of running gh merge when PR is dirty', async () => {
|
|
ghExecFileAsyncMock
|
|
.mockResolvedValueOnce({ stdout: JSON.stringify({ stack: null }) })
|
|
.mockResolvedValueOnce({
|
|
stdout: JSON.stringify({
|
|
number: 7,
|
|
title: 'PR',
|
|
state: 'OPEN',
|
|
url: 'https://github.com/stablyai/orca/pull/7',
|
|
statusCheckRollup: [],
|
|
updatedAt: '2026-04-01T00:00:00Z',
|
|
isDraft: false,
|
|
mergeable: 'CONFLICTING',
|
|
baseRefName: 'main',
|
|
baseRefOid: 'base-oid',
|
|
headRefOid: 'head-oid'
|
|
})
|
|
})
|
|
gitExecFileAsyncMock
|
|
.mockResolvedValueOnce({ stdout: '' })
|
|
.mockResolvedValueOnce({ stdout: 'latest-base-oid\n' })
|
|
.mockResolvedValueOnce({ stdout: 'merge-base-oid\n' })
|
|
.mockResolvedValueOnce({ stdout: '3\n' })
|
|
.mockResolvedValueOnce({ stdout: 'result-tree-oid\u0000src/conflict.ts\u0000' })
|
|
|
|
await expect(
|
|
mergePR('/repo-root', 7, 'squash', undefined, {
|
|
owner: 'stablyai',
|
|
repo: 'orca',
|
|
host: 'github.com'
|
|
})
|
|
).resolves.toEqual({
|
|
ok: false,
|
|
error:
|
|
'This pull request has merge conflicts and cannot be merged yet.\n' +
|
|
'3 commits behind main (base commit: latest-).\n\n' +
|
|
'Conflicting files:\n' +
|
|
'- src/conflict.ts'
|
|
})
|
|
|
|
expect(ghExecFileAsyncMock).toHaveBeenCalledTimes(2)
|
|
})
|
|
|
|
it('does not run merge conflict preflight for SSH-backed repos', async () => {
|
|
ghExecFileAsyncMock
|
|
.mockResolvedValueOnce({ stdout: JSON.stringify({ stack: null }) })
|
|
.mockResolvedValueOnce({
|
|
stdout: JSON.stringify({
|
|
number: 7,
|
|
title: 'PR',
|
|
state: 'OPEN',
|
|
url: 'https://github.com/stablyai/orca/pull/7',
|
|
statusCheckRollup: [],
|
|
updatedAt: '2026-04-01T00:00:00Z',
|
|
isDraft: false,
|
|
mergeable: 'CONFLICTING',
|
|
baseRefName: 'main',
|
|
baseRefOid: 'base-oid',
|
|
headRefOid: 'head-oid'
|
|
})
|
|
})
|
|
.mockResolvedValueOnce({ stdout: '', stderr: '' })
|
|
|
|
await expect(
|
|
mergePR('/remote/repo-root', 7, 'squash', 'ssh-1', {
|
|
owner: 'stablyai',
|
|
repo: 'orca',
|
|
host: 'github.com'
|
|
})
|
|
).resolves.toEqual({ ok: true })
|
|
|
|
expect(ghExecFileAsyncMock).toHaveBeenCalledTimes(3)
|
|
expect(ghExecFileAsyncMock).toHaveBeenNthCalledWith(
|
|
3,
|
|
['pr', 'merge', '7', '--squash', '--repo', 'stablyai/orca'],
|
|
expect.objectContaining({
|
|
env: expect.objectContaining({ GH_PROMPT_DISABLED: '1' })
|
|
})
|
|
)
|
|
expect(ghExecFileAsyncMock.mock.calls[0]?.[1]).not.toHaveProperty('cwd')
|
|
expect(gitExecFileAsyncMock).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('blocks review-thread resolve mutations before spawning gh when GraphQL is low', async () => {
|
|
rateLimitGuardMock.mockReturnValue({
|
|
blocked: true,
|
|
remaining: 4,
|
|
limit: 5000,
|
|
resetAt: 1_800_000_000
|
|
})
|
|
|
|
await expect(resolveReviewThread('/repo-root', 'thread-1', true)).resolves.toBe(false)
|
|
|
|
expect(ghExecFileAsyncMock).not.toHaveBeenCalled()
|
|
expect(noteRateLimitSpendMock).not.toHaveBeenCalled()
|
|
})
|
|
})
|