From 9fca6dd4564492b0deb3ca3f82a100b300f34c17 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 16 Feb 2026 05:52:47 +0100 Subject: [PATCH] test: backport from #9906 test data Required for backport of v15 security fixes w/ test automation, this is a partial cherry-pick of 5589182c548240aab4fb1f2dc23c91e267fb2ea8. Signed-off-by: Nils Philippsen Co-authored-by: Gusted Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9906 Reviewed-by: Gusted Reviewed-by: Robert Wolff Co-authored-by: Nils Philippsen Co-committed-by: Nils Philippsen --- models/fixtures/project.yml | 18 +++++++++++++++--- models/project/project_test.go | 12 ++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/models/fixtures/project.yml b/models/fixtures/project.yml index 44d87bce04..54a3061859 100644 --- a/models/fixtures/project.yml +++ b/models/fixtures/project.yml @@ -42,7 +42,7 @@ is_closed: false creator_id: 2 board_type: 1 - type: 2 + type: 1 created_unix: 1688973000 updated_unix: 1688973000 @@ -54,7 +54,7 @@ is_closed: false creator_id: 2 board_type: 1 - type: 2 + type: 1 created_unix: 1688973000 updated_unix: 1688973000 @@ -66,6 +66,18 @@ is_closed: false creator_id: 2 board_type: 1 - type: 2 + type: 1 + created_unix: 1688973000 + updated_unix: 1688973000 + +- + id: 7 + title: project on org3 + owner_id: 3 + repo_id: 0 + is_closed: false + creator_id: 2 + board_type: 1 + type: 1 created_unix: 1688973000 updated_unix: 1688973000 diff --git a/models/project/project_test.go b/models/project/project_test.go index ee9fdaa2e2..d4cf13c971 100644 --- a/models/project/project_test.go +++ b/models/project/project_test.go @@ -93,19 +93,19 @@ func TestProjectsSort(t *testing.T) { }{ { sortType: "default", - wants: []int64{1, 3, 2, 6, 5, 4}, + wants: []int64{1, 3, 2, 7, 6, 5, 4}, }, { sortType: "oldest", - wants: []int64{4, 5, 6, 2, 3, 1}, + wants: []int64{4, 5, 6, 7, 2, 3, 1}, }, { sortType: "recentupdate", - wants: []int64{1, 3, 2, 6, 5, 4}, + wants: []int64{1, 3, 2, 7, 6, 5, 4}, }, { sortType: "leastupdate", - wants: []int64{4, 5, 6, 2, 3, 1}, + wants: []int64{4, 5, 6, 7, 2, 3, 1}, }, } @@ -114,8 +114,8 @@ func TestProjectsSort(t *testing.T) { OrderBy: GetSearchOrderByBySortType(tt.sortType), }) require.NoError(t, err) - assert.EqualValues(t, int64(6), count) - if assert.Len(t, projects, 6) { + assert.EqualValues(t, int64(7), count) + if assert.Len(t, projects, 7) { for i := range projects { assert.EqualValues(t, tt.wants[i], projects[i].ID) }