Skip to content

Commit 76465a4

Browse files
committed
Fix tests
1 parent e56f89f commit 76465a4

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

models/fixtures/repo_unit.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,3 +712,9 @@
712712
type: 3
713713
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
714714
created_unix: 946684810
715+
716+
-
717+
id: 108
718+
repo_id: 4
719+
type: 8
720+
created_unix: 946684810

tests/integration/project_test.go

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010

1111
"code.gitea.io/gitea/models/db"
1212
project_model "code.gitea.io/gitea/models/project"
13+
repo_model "code.gitea.io/gitea/models/repo"
14+
"code.gitea.io/gitea/models/unittest"
1315
"code.gitea.io/gitea/tests"
1416

1517
"github.com/stretchr/testify/assert"
@@ -30,9 +32,11 @@ func TestPrivateRepoProject(t *testing.T) {
3032
func TestMoveRepoProjectColumns(t *testing.T) {
3133
defer tests.PrepareTestEnv(t)()
3234

35+
repo4 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4})
36+
3337
project1 := project_model.Project{
3438
Title: "new created project",
35-
RepoID: 1,
39+
RepoID: repo4.ID,
3640
Type: project_model.TypeRepository,
3741
BoardType: project_model.BoardTypeNone,
3842
}
@@ -54,12 +58,12 @@ func TestMoveRepoProjectColumns(t *testing.T) {
5458
assert.EqualValues(t, 1, columns[1].Sorting)
5559
assert.EqualValues(t, 2, columns[2].Sorting)
5660

57-
sess := loginUser(t, "user2")
58-
req := NewRequest(t, "GET", fmt.Sprintf("/user2/repo1/projects/%d", project1.ID))
61+
sess := loginUser(t, "user1")
62+
req := NewRequest(t, "GET", fmt.Sprintf("/%s/projects/%d", repo4.FullName(), project1.ID))
5963
resp := sess.MakeRequest(t, req, http.StatusOK)
6064
htmlDoc := NewHTMLParser(t, resp.Body)
6165

62-
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/user2/repo1/projects/%d/move?_csrf="+htmlDoc.GetCSRF(), project1.ID), map[string]any{
66+
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/%s/projects/%d/move?_csrf="+htmlDoc.GetCSRF(), repo4.FullName(), project1.ID), map[string]any{
6367
"columns": []map[string]any{
6468
{"columnID": columns[1].ID, "sorting": 0},
6569
{"columnID": columns[2].ID, "sorting": 1},
@@ -75,15 +79,5 @@ func TestMoveRepoProjectColumns(t *testing.T) {
7579
assert.EqualValues(t, columns[2].ID, columnsAfter[1].ID)
7680
assert.EqualValues(t, columns[0].ID, columnsAfter[2].ID)
7781

78-
// update the sorting back
79-
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/user2/repo1/projects/%d/move?_csrf="+htmlDoc.GetCSRF(), project1.ID), map[string]any{
80-
"columns": []map[string]any{
81-
{"columnID": columns[0].ID, "sorting": 0},
82-
{"columnID": columns[1].ID, "sorting": 1},
83-
{"columnID": columns[2].ID, "sorting": 2},
84-
},
85-
})
86-
sess.MakeRequest(t, req, http.StatusOK)
87-
8882
assert.NoError(t, project_model.DeleteProjectByID(db.DefaultContext, project1.ID))
8983
}

0 commit comments

Comments
 (0)