diff --git a/tests/integration/project_test.go b/tests/integration/project_test.go index 8c157ad26c..5ddea4314a 100644 --- a/tests/integration/project_test.go +++ b/tests/integration/project_test.go @@ -11,7 +11,6 @@ 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,21 +32,15 @@ func TestPrivateRepoProject(t *testing.T) { 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) + repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}) project1 := project_model.Project{ Title: "new created project", - RepoID: repo4.ID, + RepoID: repo2.ID, 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++ { @@ -66,11 +59,11 @@ func TestMoveRepoProjectColumns(t *testing.T) { assert.EqualValues(t, 2, columns[2].Sorting) sess := loginUser(t, "user1") - req := NewRequest(t, "GET", fmt.Sprintf("/%s/projects/%d", repo4.FullName(), project1.ID)) + req := NewRequest(t, "GET", fmt.Sprintf("/%s/projects/%d", repo2.FullName(), project1.ID)) resp := sess.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) - req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/%s/projects/%d/move?_csrf="+htmlDoc.GetCSRF(), repo4.FullName(), project1.ID), map[string]any{ + req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/%s/projects/%d/move?_csrf="+htmlDoc.GetCSRF(), repo2.FullName(), project1.ID), map[string]any{ "columns": []map[string]any{ {"columnID": columns[1].ID, "sorting": 0}, {"columnID": columns[2].ID, "sorting": 1}, @@ -87,6 +80,4 @@ 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) }