From bf02da9fd9f3823a54a99040a58ba3eabd1af5b4 Mon Sep 17 00:00:00 2001 From: Beowulf Date: Sat, 3 May 2025 15:24:56 +0000 Subject: [PATCH] chore: Fix outdated usage of unittest.OverrideFixtures (#7772) The function unittest.OverrideFixtures was changed with 7e489eed25f65a022ffc6503d74930943bee3a89. The PR with the util_misc_test was older and merged after the change to the unittest.OverrideFixtures function. So the test was still using the old function, which leads to a conflict / error when running tests. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7772 Reviewed-by: Michael Kriese Reviewed-by: Earl Warren Co-authored-by: Beowulf Co-committed-by: Beowulf --- modules/templates/util_misc_test.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/modules/templates/util_misc_test.go b/modules/templates/util_misc_test.go index 3e9e03c1d7..3d59f29bd1 100644 --- a/modules/templates/util_misc_test.go +++ b/modules/templates/util_misc_test.go @@ -4,7 +4,6 @@ package templates import ( - "path/filepath" "testing" activities_model "forgejo.org/models/activities" @@ -15,7 +14,6 @@ import ( "forgejo.org/modules/git" "forgejo.org/modules/json" "forgejo.org/modules/repository" - "forgejo.org/modules/setting" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -93,13 +91,7 @@ fs9cMpZVM9BfIKNUSO8QY= } func TestActionContent2Commits_VerificationState(t *testing.T) { - defer unittest.OverrideFixtures( - unittest.FixturesOptions{ - Dir: filepath.Join(setting.AppWorkPath, "models/fixtures/"), - Base: setting.AppWorkPath, - Dirs: []string{"models/fixtures/TestParseCommitWithSSHSignature/"}, - }, - )() + defer unittest.OverrideFixtures("models/fixtures/TestParseCommitWithSSHSignature/")() require.NoError(t, unittest.PrepareTestDatabase()) user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2, OwnerID: user2.ID})