Docker/forgejo
Docker/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-02 08:25:20 +02:00
Code Issues Releases Activity

bug: unify RepoActionRun and ActionRun structs (#8250)

Browse source 
Two pull requests were merged at the same time

- https://codeberg.org/forgejo/forgejo/pulls/7699
- https://codeberg.org/forgejo/forgejo/pulls/7508

And added conflicting structs ActionRun modules/structs.  That broke
the forgejo development branch and a quick fix was made to resolve
the name conflict.

- https://codeberg.org/forgejo/forgejo/pulls/8066

However that creates an undesirable duplication of two structures that
serve the same purpose but are different.

- Remove RepoActionRun and replace it with ActionRun
- convert.ToActionRun has one more argument, the doer, because it
  is determined differently in the context of webhooks or API

### Tests

- No need because the two pull requests involved already have good coverage.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8250
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
Reviewed-by: klausfyhn <klausfyhn@noreply.codeberg.org>
Reviewed-by: Christopher Besch <mail@chris-besch.com>
Co-authored-by: Earl Warren <contact@earl-warren.org>
Co-committed-by: Earl Warren <contact@earl-warren.org>
This commit is contained in:
Earl Warren 2025-06-23 07:54:32 +02:00 • committed by Earl Warren
parent b58cebc2d9
commit cf4d0e6c34
9 changed files with 187 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/integration/api_repo_actions_test.go
View file

@ -169,7 +169,7 @@ func TestAPIGetListActionRun(t *testing.T) {
req.AddTokenAuth(token)
res := MakeRequest(t, req, http.StatusOK)
apiRuns := new(api.ListRepoActionRunResponse)
apiRuns := new(api.ListActionRunResponse)
DecodeJSON(t, res, apiRuns)
assert.Equal(t, int64(len(tt.expectedIDs)), apiRuns.TotalCount)
@ -231,13 +231,13 @@ func TestAPIGetActionRun(t *testing.T) {
}
dbRun := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: tt.runID})
apiRun := new(api.RepoActionRun)
apiRun := new(api.ActionRun)
DecodeJSON(t, res, apiRun)
assert.Equal(t, dbRun.Index, apiRun.RunNumber)
assert.Equal(t, dbRun.Index, apiRun.Index)
assert.Equal(t, dbRun.Status.String(), apiRun.Status)
assert.Equal(t, dbRun.CommitSHA, apiRun.HeadSHA)
assert.Equal(t, dbRun.TriggerUserID, apiRun.TriggeringActor.ID)
assert.Equal(t, dbRun.CommitSHA, apiRun.CommitSHA)
assert.Equal(t, dbRun.TriggerUserID, apiRun.TriggerUser.ID)
})
}
}