1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-03 00:45:22 +02:00

[v11.0/forgejo] chore: merge tests.AddFixtures and unittest.OverrideFixtures (#7649)

**Backport:** https://codeberg.org/forgejo/forgejo/pulls/7648

The only parameter that is ever used is a single directory, make it that only instead of a more complex option structure.

Remove tests.AddFixtures that was the simpler form because it is now redundant.

---

Backporting to v11.0 will help with automated backporting of bug fixes in need of custom made fixtures.

Co-authored-by: Earl Warren <contact@earl-warren.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7649
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
This commit is contained in:
forgejo-backport-action 2025-04-25 09:59:30 +00:00 committed by Earl Warren
parent b2241c3939
commit c5bfe77873
26 changed files with 37 additions and 112 deletions

View file

@ -1084,7 +1084,7 @@ func TestIssueReferenceURL(t *testing.T) {
}
func TestGetContentHistory(t *testing.T) {
defer tests.AddFixtures("tests/integration/fixtures/TestGetContentHistory/")()
defer unittest.OverrideFixtures("tests/integration/fixtures/TestGetContentHistory")()
defer tests.PrepareTestEnv(t)()
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
@ -1136,7 +1136,7 @@ func TestGetContentHistory(t *testing.T) {
}
func TestCommitRefComment(t *testing.T) {
defer tests.AddFixtures("tests/integration/fixtures/TestCommitRefComment/")()
defer unittest.OverrideFixtures("tests/integration/fixtures/TestCommitRefComment")()
defer tests.PrepareTestEnv(t)()
t.Run("Pull request", func(t *testing.T) {