luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-06-21 00:20:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

chore: merge tests.AddFixtures and unittest.OverrideFixtures (#7648)

Browse source 
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.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7648
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
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-04-25 09:14:33 +00:00 • committed by Earl Warren
parent 580b7e2671
commit 7e489eed25
26 changed files with 37 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/integration/block_test.go
View file

@ -167,7 +167,7 @@ func TestBlockUserFromOrganization(t *testing.T) {
// and as a blocked user and are handled cleanly after the blocking has taken
// place.
func TestBlockActions(t *testing.T) {
defer tests.AddFixtures("tests/integration/fixtures/TestBlockActions/")()
defer unittest.OverrideFixtures("tests/integration/fixtures/TestBlockActions")()
defer tests.PrepareTestEnv(t)()
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
@ -438,7 +438,7 @@ func TestBlockActions(t *testing.T) {
}
func TestBlockedNotification(t *testing.T) {
defer tests.AddFixtures("tests/integration/fixtures/TestBlockedNotifications")()
defer unittest.OverrideFixtures("tests/integration/fixtures/TestBlockedNotifications")()
defer tests.PrepareTestEnv(t)()
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})