diff --git a/supacode/Clients/Github/PullRequestMergeReadiness.swift b/supacode/Clients/Github/PullRequestMergeReadiness.swift index 91358303..659dd738 100644 --- a/supacode/Clients/Github/PullRequestMergeReadiness.swift +++ b/supacode/Clients/Github/PullRequestMergeReadiness.swift @@ -30,9 +30,7 @@ nonisolated struct PullRequestMergeReadiness: Equatable, Hashable { return } - let isMergeable = mergeable == "MERGEABLE" - let isClean = mergeStateStatus == "CLEAN" - if isMergeable && isClean { + if mergeable == "MERGEABLE" { self.blockingReason = nil return } diff --git a/supacodeTests/CommandPaletteFeatureTests.swift b/supacodeTests/CommandPaletteFeatureTests.swift index dd7a21c8..8696cb12 100644 --- a/supacodeTests/CommandPaletteFeatureTests.swift +++ b/supacodeTests/CommandPaletteFeatureTests.swift @@ -439,8 +439,8 @@ struct CommandPaletteFeatureTests { addedLines: nil, removedLines: nil, pullRequest: makePullRequest( - mergeable: "MERGEABLE", - mergeStateStatus: "BEHIND" + mergeable: "UNKNOWN", + mergeStateStatus: "BLOCKED" ) ) diff --git a/supacodeTests/PullRequestMergeReadinessTests.swift b/supacodeTests/PullRequestMergeReadinessTests.swift index 90c75f51..e6ba180d 100644 --- a/supacodeTests/PullRequestMergeReadinessTests.swift +++ b/supacodeTests/PullRequestMergeReadinessTests.swift @@ -48,10 +48,10 @@ struct PullRequestMergeReadinessTests { #expect(readiness.label == "2 checks failed") } - @Test func mergeReadinessIsMergeableWhenCleanAndMergeable() { + @Test func mergeReadinessIsMergeableWhenMergeable() { let pullRequest = makePullRequest( mergeable: "MERGEABLE", - mergeStateStatus: "CLEAN" + mergeStateStatus: "BEHIND" ) let readiness = PullRequestMergeReadiness(pullRequest: pullRequest) @@ -63,7 +63,7 @@ struct PullRequestMergeReadinessTests { @Test func mergeReadinessFallsBackToBlockedForOtherStates() { let pullRequest = makePullRequest( - mergeable: "MERGEABLE", + mergeable: "UNKNOWN", mergeStateStatus: "BEHIND" )