fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 16:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MODERATION] cope with shared fixtures

Browse source 
* There is one more issue in the fixtures and this breaks some tests
* The users in the shared fixtures were renamed for clarity and that
  breaks some tests
This commit is contained in:
Earl Warren 2023-09-18 16:20:47 +02:00
parent 7ee8db0f01
commit 707a4edbdf
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/indexer/issues/indexer_test.go
View file

@ -200,7 +200,7 @@ func searchIssueIsPull(t *testing.T) {
SearchOptions{ SearchOptions{
IsPull: util.OptionalBoolFalse, IsPull: util.OptionalBoolFalse,
}, },
[]int64{17, 16, 15, 14, 13, 6, 5, 18, 10, 7, 4, 1}, []int64{17, 16, 15, 14, 13, 6, 5, 20, 18, 10, 7, 4, 1},
}, },
{ {
SearchOptions{ SearchOptions{
@ -227,7 +227,7 @@ func searchIssueIsClosed(t *testing.T) {
SearchOptions{ SearchOptions{
IsClosed: util.OptionalBoolFalse, IsClosed: util.OptionalBoolFalse,
}, },
[]int64{17, 16, 15, 14, 13, 12, 11, 6, 19, 18, 10, 7, 9, 8, 3, 2, 1}, []int64{17, 16, 15, 14, 13, 12, 11, 6, 20, 19, 18, 10, 7, 9, 8, 3, 2, 1},
}, },
{ {
SearchOptions{ SearchOptions{
@ -293,7 +293,7 @@ func searchIssueByLabelID(t *testing.T) {
SearchOptions{ SearchOptions{
ExcludedLabelIDs: []int64{1}, ExcludedLabelIDs: []int64{1},
}, },
[]int64{17, 16, 15, 14, 13, 12, 11, 6, 5, 19, 18, 10, 7, 4, 9, 8, 3}, []int64{17, 16, 15, 14, 13, 12, 11, 6, 5, 20, 19, 18, 10, 7, 4, 9, 8, 3},
}, },
} }
for _, test := range tests { for _, test := range tests {
@ -317,7 +317,7 @@ func searchIssueByTime(t *testing.T) {
SearchOptions{ SearchOptions{
UpdatedAfterUnix: int64Pointer(0), UpdatedAfterUnix: int64Pointer(0),
}, },
[]int64{17, 16, 15, 14, 13, 12, 11, 6, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2, 1}, []int64{17, 16, 15, 14, 13, 12, 11, 6, 5, 20, 19, 18, 10, 7, 4, 9, 8, 3, 2, 1},
}, },
} }
for _, test := range tests { for _, test := range tests {
@ -338,7 +338,7 @@ func searchIssueWithOrder(t *testing.T) {
SearchOptions{ SearchOptions{
SortBy: internal.SortByCreatedAsc, SortBy: internal.SortByCreatedAsc,
}, },
[]int64{1, 2, 3, 8, 9, 4, 7, 10, 18, 19, 5, 6, 11, 12, 13, 14, 15, 16, 17}, []int64{1, 2, 3, 8, 9, 4, 7, 10, 18, 19, 20, 5, 6, 11, 12, 13, 14, 15, 16, 17},
}, },
} }
for _, test := range tests { for _, test := range tests {
@ -393,7 +393,7 @@ func searchIssueWithPaginator(t *testing.T) {
}, },
}, },
[]int64{17, 16, 15, 14, 13}, []int64{17, 16, 15, 14, 13},
19, 20,
}, },
} }
for _, test := range tests { for _, test := range tests {

4
tests/integration/api_block_test.go
View file

@ -84,7 +84,7 @@ func TestAPIOrgBlock(t *testing.T) {
defer tests.PrepareTestEnv(t)() defer tests.PrepareTestEnv(t)()
user := "user5" user := "user5"
org := "user6" org := "org6"
session := loginUser(t, user) session := loginUser(t, user)
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteOrganization) token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteOrganization)
@ -163,7 +163,7 @@ func TestAPIOrgBlock(t *testing.T) {
t.Run("Not as owner", func(t *testing.T) { t.Run("Not as owner", func(t *testing.T) {
defer tests.PrintCurrentTest(t)() defer tests.PrintCurrentTest(t)()
org := "user3" org := "org3"
user := "user4" // Part of org team with write perms. user := "user4" // Part of org team with write perms.
session := loginUser(t, user) session := loginUser(t, user)