rdelaage
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix tests

This commit is contained in:
Lunny Xiao 2024-05-05 10:05:57 +08:00
parent e56f89fdba
commit 76465a4490
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
models/fixtures/repo_unit.yml
View File

@ -712,3 +712,9 @@
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

22
tests/integration/project_test.go
View File

@ -10,6 +10,8 @@ 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/unittest"
"code.gitea.io/gitea/tests"
"github.com/stretchr/testify/assert"
@ -30,9 +32,11 @@ func TestPrivateRepoProject(t *testing.T) {
func TestMoveRepoProjectColumns(t *testing.T) {
defer tests.PrepareTestEnv(t)()
repo4 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4})
project1 := project_model.Project{
Title: "new created project",
RepoID: 1,
RepoID: repo4.ID,
Type: project_model.TypeRepository,
BoardType: project_model.BoardTypeNone,
}
@ -54,12 +58,12 @@ func TestMoveRepoProjectColumns(t *testing.T) {
assert.EqualValues(t, 1, columns[1].Sorting)
assert.EqualValues(t, 2, columns[2].Sorting)
sess := loginUser(t, "user2")
req := NewRequest(t, "GET", fmt.Sprintf("/user2/repo1/projects/%d", project1.ID))
sess := loginUser(t, "user1")
req := NewRequest(t, "GET", fmt.Sprintf("/%s/projects/%d", repo4.FullName(), project1.ID))
resp := sess.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/user2/repo1/projects/%d/move?_csrf="+htmlDoc.GetCSRF(), project1.ID), map[string]any{
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/%s/projects/%d/move?_csrf="+htmlDoc.GetCSRF(), repo4.FullName(), project1.ID), map[string]any{
"columns": []map[string]any{
{"columnID": columns[1].ID, "sorting": 0},
{"columnID": columns[2].ID, "sorting": 1},
@ -75,15 +79,5 @@ func TestMoveRepoProjectColumns(t *testing.T) {
assert.EqualValues(t, columns[2].ID, columnsAfter[1].ID)
assert.EqualValues(t, columns[0].ID, columnsAfter[2].ID)
// update the sorting back
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/user2/repo1/projects/%d/move?_csrf="+htmlDoc.GetCSRF(), project1.ID), map[string]any{
"columns": []map[string]any{
{"columnID": columns[0].ID, "sorting": 0},
{"columnID": columns[1].ID, "sorting": 1},
{"columnID": columns[2].ID, "sorting": 2},
},
})
sess.MakeRequest(t, req, http.StatusOK)
assert.NoError(t, project_model.DeleteProjectByID(db.DefaultContext, project1.ID))
}