Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-01-09 05:49:16 +01:00
Code Issues Activity

Fix tests

Browse Source
This commit is contained in:
Lunny Xiao 2025-05-25 16:25:50 -07:00
parent 4171935599
commit eb9fe87231
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
routers/api/v1/repo/status.go
View File

@ -201,15 +201,10 @@ func getCommitStatuses(ctx *context.APIContext, commitID string) {
return
}
apiStatuses := make([]*api.CommitStatus, 0, len(statuses))
for _, status := range statuses {
apiStatuses = append(apiStatuses, convert.ToCommitStatus(ctx, status))
}
ctx.SetLinkHeader(int(maxResults), listOptions.PageSize)
ctx.SetTotalCountHeader(maxResults)
ctx.JSON(http.StatusOK, apiStatuses)
ctx.JSON(http.StatusOK, convert.ToCommitStatuses(ctx, statuses))
}
// GetCombinedCommitStatusByRef returns the combined status for any given commit hash

9
services/convert/status.go
View File

@ -33,6 +33,14 @@ func ToCommitStatus(ctx context.Context, status *git_model.CommitStatus) *api.Co
return apiStatus
}
func ToCommitStatuses(ctx context.Context, statuses []*git_model.CommitStatus) []*api.CommitStatus {
apiStatuses := make([]*api.CommitStatus, len(statuses))
for i, status := range statuses {
apiStatuses[i] = ToCommitStatus(ctx, status)
}
return apiStatuses
}
// ToCombinedStatus converts List of CommitStatus to a CombinedStatus
func ToCombinedStatus(ctx context.Context, statuses []*git_model.CommitStatus, repo *api.Repository) *api.CombinedStatus {
if len(statuses) == 0 {
@ -42,6 +50,7 @@ func ToCombinedStatus(ctx context.Context, statuses []*git_model.CommitStatus, r
combinedStatus := git_model.CalcCombinedStatus(statuses)
return &api.CombinedStatus{
State: combinedStatus.State,
Statuses: ToCommitStatuses(ctx, statuses),
SHA: combinedStatus.SHA,
TotalCount: len(statuses),
Repository: repo,

2
tests/integration/pull_status_test.go
View File

@ -100,7 +100,7 @@ func TestPullCreate_CommitStatus(t *testing.T) {
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: "repo1"})
css := unittest.AssertExistsAndLoadBean(t, &git_model.CombinedStatus{RepoID: repo1.ID, SHA: commitID})
assert.Equal(t, commitstatus.CommitStatusWarning, css.State)
assert.Equal(t, commitstatus.CombinedStatusSuccess, css.State) // warning will also be counted as success
})
}