From 5514594bc8fcea6ab76215719e68e5877669d503 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 5 May 2024 10:44:27 +0800 Subject: [PATCH] Add repo unit for repo4 dynamically in test --- models/fixtures/repo_unit.yml | 6 ------ tests/integration/project_test.go | 11 ++++++++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml index e019c0f585..8a22db0445 100644 --- a/models/fixtures/repo_unit.yml +++ b/models/fixtures/repo_unit.yml @@ -712,9 +712,3 @@ type: 3 config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}" created_unix: 946684810 - -- - id: 108 - repo_id: 4 - type: 8 - created_unix: 946684810 diff --git a/tests/integration/project_test.go b/tests/integration/project_test.go index 9ac441d6be..8c157ad26c 100644 --- a/tests/integration/project_test.go +++ b/tests/integration/project_test.go @@ -11,6 +11,7 @@ import ( "code.gitea.io/gitea/models/db" project_model "code.gitea.io/gitea/models/project" repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/tests" @@ -33,6 +34,12 @@ func TestMoveRepoProjectColumns(t *testing.T) { defer tests.PrepareTestEnv(t)() repo4 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4}) + repoUnit := repo_model.RepoUnit{ + RepoID: repo4.ID, + Type: unit.TypeProjects, + } + err := db.Insert(db.DefaultContext, &repoUnit) + assert.NoError(t, err) project1 := project_model.Project{ Title: "new created project", @@ -40,7 +47,7 @@ func TestMoveRepoProjectColumns(t *testing.T) { Type: project_model.TypeRepository, BoardType: project_model.BoardTypeNone, } - err := project_model.NewProject(db.DefaultContext, &project1) + err = project_model.NewProject(db.DefaultContext, &project1) assert.NoError(t, err) for i := 0; i < 3; i++ { @@ -80,4 +87,6 @@ func TestMoveRepoProjectColumns(t *testing.T) { assert.EqualValues(t, columns[0].ID, columnsAfter[2].ID) assert.NoError(t, project_model.DeleteProjectByID(db.DefaultContext, project1.ID)) + _, err = db.DeleteByID[repo_model.RepoUnit](db.DefaultContext, repoUnit.ID) + assert.NoError(t, err) }