mirror of
https://github.com/go-gitea/gitea.git
synced 2025-10-27 00:23:41 +09:00
Remove incorrect "db.DefaultContext" usages (#35366)
This commit is contained in:
@@ -10,7 +10,6 @@ import (
|
||||
"strconv"
|
||||
"testing"
|
||||
|
||||
"code.gitea.io/gitea/models/db"
|
||||
org_model "code.gitea.io/gitea/models/organization"
|
||||
"code.gitea.io/gitea/models/unittest"
|
||||
user_model "code.gitea.io/gitea/models/user"
|
||||
@@ -92,9 +91,9 @@ func TestForkListLimitedAndPrivateRepos(t *testing.T) {
|
||||
// fork to a limited org
|
||||
limitedOrg := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 22})
|
||||
assert.Equal(t, structs.VisibleTypeLimited, limitedOrg.Visibility)
|
||||
ownerTeam1, err := org_model.OrgFromUser(limitedOrg).GetOwnerTeam(db.DefaultContext)
|
||||
ownerTeam1, err := org_model.OrgFromUser(limitedOrg).GetOwnerTeam(t.Context())
|
||||
assert.NoError(t, err)
|
||||
assert.NoError(t, org_service.AddTeamMember(db.DefaultContext, ownerTeam1, user1))
|
||||
assert.NoError(t, org_service.AddTeamMember(t.Context(), ownerTeam1, user1))
|
||||
testRepoFork(t, user1Sess, "user2", "repo1", limitedOrg.Name, "repo1", "")
|
||||
|
||||
// fork to a private org
|
||||
@@ -102,9 +101,9 @@ func TestForkListLimitedAndPrivateRepos(t *testing.T) {
|
||||
user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user4"})
|
||||
privateOrg := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 23})
|
||||
assert.Equal(t, structs.VisibleTypePrivate, privateOrg.Visibility)
|
||||
ownerTeam2, err := org_model.OrgFromUser(privateOrg).GetOwnerTeam(db.DefaultContext)
|
||||
ownerTeam2, err := org_model.OrgFromUser(privateOrg).GetOwnerTeam(t.Context())
|
||||
assert.NoError(t, err)
|
||||
assert.NoError(t, org_service.AddTeamMember(db.DefaultContext, ownerTeam2, user4))
|
||||
assert.NoError(t, org_service.AddTeamMember(t.Context(), ownerTeam2, user4))
|
||||
testRepoFork(t, user4Sess, "user2", "repo1", privateOrg.Name, "repo1", "")
|
||||
|
||||
t.Run("Anonymous", func(t *testing.T) {
|
||||
@@ -124,7 +123,7 @@ func TestForkListLimitedAndPrivateRepos(t *testing.T) {
|
||||
// since user1 is an admin, he can get both of the forked repositories
|
||||
assert.Equal(t, 2, htmlDoc.Find(forkItemSelector).Length())
|
||||
|
||||
assert.NoError(t, org_service.AddTeamMember(db.DefaultContext, ownerTeam2, user1))
|
||||
assert.NoError(t, org_service.AddTeamMember(t.Context(), ownerTeam2, user1))
|
||||
resp = user1Sess.MakeRequest(t, req, http.StatusOK)
|
||||
htmlDoc = NewHTMLParser(t, resp.Body)
|
||||
assert.Equal(t, 2, htmlDoc.Find(forkItemSelector).Length())
|
||||
|
||||
Reference in New Issue
Block a user