mirror of https://github.com/go-gitea/gitea.git
Fix tests
This commit is contained in:
parent
e56f89fdba
commit
76465a4490
|
@ -712,3 +712,9 @@
|
||||||
type: 3
|
type: 3
|
||||||
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
|
||||||
created_unix: 946684810
|
created_unix: 946684810
|
||||||
|
|
||||||
|
-
|
||||||
|
id: 108
|
||||||
|
repo_id: 4
|
||||||
|
type: 8
|
||||||
|
created_unix: 946684810
|
||||||
|
|
|
@ -10,6 +10,8 @@ import (
|
||||||
|
|
||||||
"code.gitea.io/gitea/models/db"
|
"code.gitea.io/gitea/models/db"
|
||||||
project_model "code.gitea.io/gitea/models/project"
|
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"
|
"code.gitea.io/gitea/tests"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
@ -30,9 +32,11 @@ func TestPrivateRepoProject(t *testing.T) {
|
||||||
func TestMoveRepoProjectColumns(t *testing.T) {
|
func TestMoveRepoProjectColumns(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
|
repo4 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4})
|
||||||
|
|
||||||
project1 := project_model.Project{
|
project1 := project_model.Project{
|
||||||
Title: "new created project",
|
Title: "new created project",
|
||||||
RepoID: 1,
|
RepoID: repo4.ID,
|
||||||
Type: project_model.TypeRepository,
|
Type: project_model.TypeRepository,
|
||||||
BoardType: project_model.BoardTypeNone,
|
BoardType: project_model.BoardTypeNone,
|
||||||
}
|
}
|
||||||
|
@ -54,12 +58,12 @@ func TestMoveRepoProjectColumns(t *testing.T) {
|
||||||
assert.EqualValues(t, 1, columns[1].Sorting)
|
assert.EqualValues(t, 1, columns[1].Sorting)
|
||||||
assert.EqualValues(t, 2, columns[2].Sorting)
|
assert.EqualValues(t, 2, columns[2].Sorting)
|
||||||
|
|
||||||
sess := loginUser(t, "user2")
|
sess := loginUser(t, "user1")
|
||||||
req := NewRequest(t, "GET", fmt.Sprintf("/user2/repo1/projects/%d", project1.ID))
|
req := NewRequest(t, "GET", fmt.Sprintf("/%s/projects/%d", repo4.FullName(), project1.ID))
|
||||||
resp := sess.MakeRequest(t, req, http.StatusOK)
|
resp := sess.MakeRequest(t, req, http.StatusOK)
|
||||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
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{
|
"columns": []map[string]any{
|
||||||
{"columnID": columns[1].ID, "sorting": 0},
|
{"columnID": columns[1].ID, "sorting": 0},
|
||||||
{"columnID": columns[2].ID, "sorting": 1},
|
{"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[2].ID, columnsAfter[1].ID)
|
||||||
assert.EqualValues(t, columns[0].ID, columnsAfter[2].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))
|
assert.NoError(t, project_model.DeleteProjectByID(db.DefaultContext, project1.ID))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue