diff options
| author | JakobDev <jakobdev@gmx.de> | 2023-10-11 06:24:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-11 04:24:07 +0000 |
| commit | ebe803e514acb4eedc884226be2489ee6b4acd28 (patch) | |
| tree | 3f4d38f8267142dcd0e8df7d76cd4fe04c47b85e /tests | |
| parent | 50166d1f7c6df41c79561b094e29c9698c0000d5 (diff) | |
| download | gitea-ebe803e514acb4eedc884226be2489ee6b4acd28.tar.gz gitea-ebe803e514acb4eedc884226be2489ee6b4acd28.zip | |
Penultimate round of `db.DefaultContext` refactor (#27414)
Part of #27065
---------
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/integration/auth_ldap_test.go | 2 | ||||
| -rw-r--r-- | tests/integration/pull_merge_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index ac4c41bf4d..dbd3bc9346 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -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) diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go index adb0e982c0..f94809e4b3 100644 --- a/tests/integration/pull_merge_test.go +++ b/tests/integration/pull_merge_test.go @@ -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)) }) } |