From f09726d92b0867cdbcbfd0969911cbebf520b3e5 Mon Sep 17 00:00:00 2001 From: oliverpool Date: Wed, 13 May 2026 21:43:19 +0200 Subject: [PATCH] forgery: refactor repo_activity_test --- tests/integration/repo_activity_test.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/integration/repo_activity_test.go b/tests/integration/repo_activity_test.go index e30f92daa3..0386498100 100644 --- a/tests/integration/repo_activity_test.go +++ b/tests/integration/repo_activity_test.go @@ -16,11 +16,10 @@ import ( "forgejo.org/models/db" repo_model "forgejo.org/models/repo" unit_model "forgejo.org/models/unit" - "forgejo.org/models/unittest" - user_model "forgejo.org/models/user" "forgejo.org/modules/test" repo_service "forgejo.org/services/repository" "forgejo.org/tests" + "forgejo.org/tests/forgery" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" @@ -105,7 +104,7 @@ func TestRepoActivity(t *testing.T) { func TestRepoActivityAllUnitsDisabled(t *testing.T) { defer tests.PrepareTestEnv(t)() - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user1"}) + user := forgery.CreateUser(t, nil) session := loginUser(t, user.Name) unit_model.LoadUnitConfig() @@ -135,7 +134,7 @@ func TestRepoActivityAllUnitsDisabled(t *testing.T) { func TestRepoActivityOnlyCodeUnitWithEmptyRepo(t *testing.T) { defer tests.PrepareTestEnv(t)() - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user1"}) + user := forgery.CreateUser(t, nil) session := loginUser(t, user.Name) unit_model.LoadUnitConfig() @@ -168,14 +167,17 @@ func TestRepoActivityOnlyCodeUnitWithEmptyRepo(t *testing.T) { func TestRepoActivityOnlyCodeUnitWithNonEmptyRepo(t *testing.T) { defer tests.PrepareTestEnv(t)() - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user1"}) + user := forgery.CreateUser(t, nil) session := loginUser(t, user.Name) unit_model.LoadUnitConfig() // Create a repo, with only code unit enabled. - repo, _, f := tests.CreateDeclarativeRepo(t, user, "", []unit_model.Type{unit_model.TypeCode}, nil, nil) - defer f() + repo := forgery.CreateRepository(t, user, &forgery.CreateRepositoryOptions{ + Files: forgery.FilesInit{}, + }) + forgery.DisableRepoUnits(t, repo, unit_model.AllRepoUnitTypes...) + forgery.EnableRepoUnits(t, repo, unit_model.TypeCode) req := NewRequest(t, "GET", fmt.Sprintf("%s/activity", repo.Link())) session.MakeRequest(t, req, http.StatusOK) @@ -191,7 +193,7 @@ func TestRepoActivityOnlyCodeUnitWithNonEmptyRepo(t *testing.T) { func TestRepoActivityOnlyIssuesUnit(t *testing.T) { defer tests.PrepareTestEnv(t)() - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user1"}) + user := forgery.CreateUser(t, nil) session := loginUser(t, user.Name) unit_model.LoadUnitConfig()