Files
sam 5edf58fd68 fix(daemon): reconcile and merge tasks whose PR was merged on the forge (#1872)
ListOpenPRs dropped org_id, so the reconciler resolved the forge and
worktrees in the default org instead of the task's own and skipped the
task silently. Select the org, log a skipped task, and let the Merge
action succeed when the forge reports the PR already merged.
2026-11-14 04:01:31 +11:00

48 lines
1.5 KiB
Go

package forge
import (
"context"
"errors"
"testing"
)
type mergeForge struct {
Forge
mergeErr, stateErr error
state string
}
func (f mergeForge) MergePR(context.Context, string, string, int) error { return f.mergeErr }
func (f mergeForge) PRState(context.Context, string, string, int) (string, error) {
return f.state, f.stateErr
}
// TestMergeOrConfirm guards the Merge action returning a conflict for a pull
// request that was already merged on the forge, leaving the task In review.
func TestMergeOrConfirm(t *testing.T) {
refused := errors.New("forge did not merge it")
tests := []struct {
name string
give mergeForge
wantErr bool
}{
{name: "merge succeeds", give: mergeForge{}},
{name: "refused but already merged", give: mergeForge{mergeErr: refused, state: "merged"}},
{name: "refused and still open", give: mergeForge{mergeErr: refused, state: "open"}, wantErr: true},
{name: "refused and closed", give: mergeForge{mergeErr: refused, state: "closed"}, wantErr: true},
{name: "refused and state unreadable", give: mergeForge{mergeErr: refused, stateErr: errors.New("down")}, wantErr: true},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
err := MergeOrConfirm(t.Context(), tt.give, "o", "r", 1)
if (err != nil) != tt.wantErr {
t.Fatalf("err = %v, wantErr %v", err, tt.wantErr)
}
if tt.wantErr && !errors.Is(err, refused) {
t.Fatalf("err = %v, want it to wrap the refusal", err)
}
})
}
}