finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Penultimate round of db.DefaultContext refactor (#27414)

Browse source 
Part of #27065

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
JakobDev 2023-10-11 06:24:07 +02:00 • committed by GitHub
parent 50166d1f7c
commit ebe803e514
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
136 changed files with 428 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/auth_ldap_test.go
View file

@ -332,7 +332,7 @@ func TestLDAPUserSyncWithGroupFilter(t *testing.T) {
})
ldapConfig := ldapSource.Cfg.(*ldap.Source)
ldapConfig.GroupFilter = "(cn=ship_crew)"
auth_model.UpdateSource(ldapSource)
auth_model.UpdateSource(db.DefaultContext, ldapSource)
auth.SyncExternalUsers(context.Background(), true)

2
tests/integration/pull_merge_test.go
View file

@ -425,6 +425,6 @@ func TestConflictChecking(t *testing.T) {
// Check if status is correct.
assert.Equal(t, issues_model.PullRequestStatusConflict, conflictingPR.Status)
// Ensure that mergeable returns false
assert.False(t, conflictingPR.Mergeable())
assert.False(t, conflictingPR.Mergeable(db.DefaultContext))
})
}