From 76465a4490261b6eddff9d40330a39c3739ef135 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sun, 5 May 2024 10:05:57 +0800
Subject: [PATCH] Fix tests

---
 models/fixtures/repo_unit.yml     |  6 ++++++
 tests/integration/project_test.go | 22 ++++++++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml
index 8a22db0445..e019c0f585 100644
--- a/models/fixtures/repo_unit.yml
+++ b/models/fixtures/repo_unit.yml
@@ -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
diff --git a/tests/integration/project_test.go b/tests/integration/project_test.go
index d36c83b411..9ac441d6be 100644
--- a/tests/integration/project_test.go
+++ b/tests/integration/project_test.go
@@ -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))
 }