Skip to content

Commit 21f019b

Browse files
committed
Fix tests
1 parent 969cc14 commit 21f019b

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

tests/integration/project_test.go

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"code.gitea.io/gitea/models/db"
1212
project_model "code.gitea.io/gitea/models/project"
1313
repo_model "code.gitea.io/gitea/models/repo"
14-
"code.gitea.io/gitea/models/unit"
1514
"code.gitea.io/gitea/models/unittest"
1615
"code.gitea.io/gitea/tests"
1716

@@ -33,21 +32,15 @@ func TestPrivateRepoProject(t *testing.T) {
3332
func TestMoveRepoProjectColumns(t *testing.T) {
3433
defer tests.PrepareTestEnv(t)()
3534

36-
repo4 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4})
37-
repoUnit := repo_model.RepoUnit{
38-
RepoID: repo4.ID,
39-
Type: unit.TypeProjects,
40-
}
41-
err := db.Insert(db.DefaultContext, &repoUnit)
42-
assert.NoError(t, err)
35+
repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
4336

4437
project1 := project_model.Project{
4538
Title: "new created project",
46-
RepoID: repo4.ID,
39+
RepoID: repo2.ID,
4740
Type: project_model.TypeRepository,
4841
BoardType: project_model.BoardTypeNone,
4942
}
50-
err = project_model.NewProject(db.DefaultContext, &project1)
43+
err := project_model.NewProject(db.DefaultContext, &project1)
5144
assert.NoError(t, err)
5245

5346
for i := 0; i < 3; i++ {
@@ -66,11 +59,11 @@ func TestMoveRepoProjectColumns(t *testing.T) {
6659
assert.EqualValues(t, 2, columns[2].Sorting)
6760

6861
sess := loginUser(t, "user1")
69-
req := NewRequest(t, "GET", fmt.Sprintf("/%s/projects/%d", repo4.FullName(), project1.ID))
62+
req := NewRequest(t, "GET", fmt.Sprintf("/%s/projects/%d", repo2.FullName(), project1.ID))
7063
resp := sess.MakeRequest(t, req, http.StatusOK)
7164
htmlDoc := NewHTMLParser(t, resp.Body)
7265

73-
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/%s/projects/%d/move?_csrf="+htmlDoc.GetCSRF(), repo4.FullName(), project1.ID), map[string]any{
66+
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/%s/projects/%d/move?_csrf="+htmlDoc.GetCSRF(), repo2.FullName(), project1.ID), map[string]any{
7467
"columns": []map[string]any{
7568
{"columnID": columns[1].ID, "sorting": 0},
7669
{"columnID": columns[2].ID, "sorting": 1},
@@ -87,6 +80,4 @@ func TestMoveRepoProjectColumns(t *testing.T) {
8780
assert.EqualValues(t, columns[0].ID, columnsAfter[2].ID)
8881

8982
assert.NoError(t, project_model.DeleteProjectByID(db.DefaultContext, project1.ID))
90-
_, err = db.DeleteByID[repo_model.RepoUnit](db.DefaultContext, repoUnit.ID)
91-
assert.NoError(t, err)
9283
}

0 commit comments

Comments
 (0)