Skip to content

Commit e496606

Browse files
roomoteedelauna
authored andcommitted
fix(labels): clear maintainer blocker on self re-request (refs #1750)
A durable maintainer CHANGES_REQUESTED blocker previously cleared only when the PR author re-requested review from the blocking maintainer. A blocking maintainer re-requesting review from themselves signals intent to re-review, so it now clears their own blocker too. The timestamp guard is unchanged, and a re-request by any other actor still has no effect. Refs #1750 Co-authored-by: Roomote <[email protected]>
1 parent 91ea751 commit e496606

2 files changed

Lines changed: 49 additions & 3 deletions

File tree

‎.github/workflows/label-pr-review-state.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -814,8 +814,10 @@ jobs:
814814
// merges, CI runs, and CodeRabbit reviews until that same
815815
// maintainer's blocker is cleared by one of:
816816
// 1. the PR author explicitly re-requesting review from them,
817-
// 2. a newer review from that maintainer (its state decides), or
818-
// 3. GitHub dismissing the blocking review.
817+
// 2. the blocking maintainer re-requesting review from themselves
818+
// (signaling intent to re-review),
819+
// 3. a newer review from that maintainer (its state decides), or
820+
// 4. GitHub dismissing the blocking review.
819821
// Latest state per reviewer is keyed by review id (monotonically
820822
// increasing) so reordered or duplicate history cannot change the
821823
// result. COMMENTED reviews are neutral and never clear a blocker;
@@ -869,9 +871,13 @@ jobs:
869871
const authorLogin = pr.user?.login?.toLowerCase();
870872
for (const event of timelineEvents) {
871873
if (event.event !== 'review_requested') continue;
872-
if (event.actor?.login?.toLowerCase() !== authorLogin) continue;
874+
const actorLogin = event.actor?.login?.toLowerCase();
873875
const requested = event.requested_reviewer?.login?.toLowerCase();
874876
if (!requested) continue;
877+
// Clear if the PR author re-requested this maintainer, OR if the
878+
// blocking maintainer re-requested themselves (signaling intent
879+
// to re-review).
880+
if (actorLogin !== authorLogin && actorLogin !== requested) continue;
875881
const blocker = maintainerBlockers.get(requested);
876882
if (!blocker) continue;
877883
const requestedAt = Date.parse(event.created_at ?? '');

‎src/services/__tests__/pr-review-state-workflow.test.ts‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2098,6 +2098,46 @@ describe("PR review-state workflow", () => {
20982098
expect(latestGateStatus(result)?.state).toBe("success")
20992099
})
21002100

2101+
it("clears the blocker when the blocking maintainer re-requests their own review", async () => {
2102+
const result = await runWorkflow({
2103+
labels: ["awaiting-author"],
2104+
permissions: { maintainer: "write" },
2105+
reviews: [coderabbitApproval, staleMaintainerChangeRequest],
2106+
timelineEvents: [
2107+
{
2108+
event: "review_requested",
2109+
actor: "maintainer",
2110+
requestedReviewer: "maintainer",
2111+
createdAt: REVIEWED_AT + 2_000,
2112+
},
2113+
],
2114+
})
2115+
2116+
expect(result.removeLabel).toHaveBeenCalledWith(expect.objectContaining({ name: "awaiting-author" }))
2117+
expect(result.addLabels).toHaveBeenCalledWith(expect.objectContaining({ labels: ["awaiting-maintainer"] }))
2118+
expect(latestGateStatus(result)?.state).toBe("success")
2119+
})
2120+
2121+
it("keeps the blocker when the maintainer self-re-request predates the blocking review", async () => {
2122+
const result = await runWorkflow({
2123+
permissions: { maintainer: "write" },
2124+
reviews: [coderabbitApproval, staleMaintainerChangeRequest],
2125+
timelineEvents: [
2126+
{
2127+
event: "review_requested",
2128+
actor: "maintainer",
2129+
requestedReviewer: "maintainer",
2130+
createdAt: REVIEWED_AT + 500,
2131+
},
2132+
],
2133+
})
2134+
2135+
expect(result.addLabels).toHaveBeenCalledWith(expect.objectContaining({ labels: ["awaiting-author"] }))
2136+
expect(result.addLabels).not.toHaveBeenCalledWith(
2137+
expect.objectContaining({ labels: ["awaiting-maintainer"] }),
2138+
)
2139+
})
2140+
21012141
it("clears the blocker when the blocking maintainer submits a newer approval", async () => {
21022142
const result = await runWorkflow({
21032143
permissions: { maintainer: "write" },

0 commit comments

Comments
 (0)