diff --git a/plugins/pstack/skills/poteto-mode/scripts/watch-pr/shipping-cli.test.ts b/plugins/pstack/skills/poteto-mode/scripts/watch-pr/shipping-cli.test.ts index 8600f6e9..70bb8afd 100644 --- a/plugins/pstack/skills/poteto-mode/scripts/watch-pr/shipping-cli.test.ts +++ b/plugins/pstack/skills/poteto-mode/scripts/watch-pr/shipping-cli.test.ts @@ -49,6 +49,10 @@ if (query.includes('disablePullRequestAutoMerge')) { state.autoMergeRequest = null; result = { disablePullRequestAutoMerge: { clientMutationId: null } }; } else if (query.includes('dequeuePullRequest')) { + if (!query.includes('dequeuePullRequest(input:{id:$id})')) { + console.error("DequeuePullRequestInput requires id"); + process.exit(1); + } state.mergeQueueEntry = null; result = { dequeuePullRequest: { clientMutationId: null } }; } else result = { repository: { pullRequest: state } }; diff --git a/plugins/pstack/skills/poteto-mode/scripts/watch-pr/shipping.test.ts b/plugins/pstack/skills/poteto-mode/scripts/watch-pr/shipping.test.ts index 84c638c4..6d698335 100644 --- a/plugins/pstack/skills/poteto-mode/scripts/watch-pr/shipping.test.ts +++ b/plugins/pstack/skills/poteto-mode/scripts/watch-pr/shipping.test.ts @@ -239,6 +239,7 @@ describe("shipping GitHub boundary", () => { }; } if (query.includes("dequeuePullRequest")) { + expect(query).toContain("dequeuePullRequest(input:{id:$id})"); expect(args).toContain("id=pr-id"); mergeQueueEntry = null; return { data: { dequeuePullRequest: { clientMutationId: null } } }; diff --git a/plugins/pstack/skills/poteto-mode/scripts/watch-pr/shipping.ts b/plugins/pstack/skills/poteto-mode/scripts/watch-pr/shipping.ts index e0249cb3..2ab22635 100644 --- a/plugins/pstack/skills/poteto-mode/scripts/watch-pr/shipping.ts +++ b/plugins/pstack/skills/poteto-mode/scripts/watch-pr/shipping.ts @@ -211,7 +211,7 @@ export class GhShippingService implements ShippingService { "api", "graphql", "-f", - "query=mutation($id:ID!) { dequeuePullRequest(input:{pullRequestId:$id}) { clientMutationId } }", + "query=mutation($id:ID!) { dequeuePullRequest(input:{id:$id}) { clientMutationId } }", "-f", `id=${id}`, ])