Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-07 12:33:36 +02:00
Code Issues Activity

Fix tests

Browse Source
This commit is contained in:
Lunny Xiao 2025-05-25 14:53:42 -07:00
parent 38708d4b75
commit 4171935599
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
routers/web/repo/commit.go
View File

@ -457,7 +457,9 @@ func processGitCommits(ctx *context.Context, gitCommits []*git.Commit) ([]*git_m
} }
if !ctx.Repo.CanRead(unit_model.TypeActions) { if !ctx.Repo.CanRead(unit_model.TypeActions) {
for _, commit := range commits { for _, commit := range commits {
commit.Status.HideActionsURL(ctx) if commit.Status != nil {
commit.Status.HideActionsURL(ctx)
}
git_model.CommitStatusesHideActionsURL(ctx, commit.Statuses) git_model.CommitStatusesHideActionsURL(ctx, commit.Statuses)
} }
} }

4
routers/web/repo/issue_view.go
View File

@ -757,7 +757,9 @@ func prepareIssueViewCommentsAndSidebarParticipants(ctx *context.Context, issue
} }
if !ctx.Repo.CanRead(unit.TypeActions) { if !ctx.Repo.CanRead(unit.TypeActions) {
for _, commit := range comment.Commits { for _, commit := range comment.Commits {
commit.Status.HideActionsURL(ctx) if commit.Status != nil {
commit.Status.HideActionsURL(ctx)
}
git_model.CommitStatusesHideActionsURL(ctx, commit.Statuses) git_model.CommitStatusesHideActionsURL(ctx, commit.Statuses)
} }
} }

9
services/pull/commit_status.go
View File

@ -40,8 +40,15 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus,
} }
} }
if len(requiredCommitStatuses) > 0 { if len(requiredCommitStatuses) > 0 {
return git_model.CalcCombinedStatusState(requiredCommitStatuses) returnedStatus := git_model.CalcCombinedStatusState(requiredCommitStatuses)
if len(requiredCommitStatuses) == len(requiredContexts) {
return returnedStatus
}
if returnedStatus == commitstatus.CombinedStatusFailure {
return commitstatus.CombinedStatusFailure
}
} }
return commitstatus.CombinedStatusPending
} }
return git_model.CalcCombinedStatusState(commitStatuses) return git_model.CalcCombinedStatusState(commitStatuses)

5
services/pull/commit_status_test.go
View File

@ -58,8 +58,9 @@ func TestMergeRequiredContextsCommitStatus(t *testing.T) {
} }
for i, commitStatuses := range testCases { for i, commitStatuses := range testCases {
if MergeRequiredContextsCommitStatus(commitStatuses, testCasesRequiredContexts[i]) != testCasesExpected[i] { status := MergeRequiredContextsCommitStatus(commitStatuses, testCasesRequiredContexts[i])
assert.Fail(t, "Test case failed", "Test case %d failed", i+1) if status != testCasesExpected[i] {
assert.Fail(t, "Test case failed", "Test case %d failed: expect %s, got %s", i+1, testCasesExpected[i], status)
} }
} }
} }