diff options
Diffstat (limited to 'tests/integration/auth_ldap_test.go')
| -rw-r--r-- | tests/integration/auth_ldap_test.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index 5c50fd0288..24f0c03bed 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -4,7 +4,6 @@ package integration import ( - "context" "net/http" "os" "strings" @@ -16,6 +15,7 @@ import ( "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/optional" + "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/modules/translation" "code.gitea.io/gitea/modules/util" @@ -238,7 +238,7 @@ func TestLDAPUserSync(t *testing.T) { defer tests.PrepareTestEnv(t)() te.addAuthSource(t) - err := auth.SyncExternalUsers(context.Background(), true) + err := auth.SyncExternalUsers(t.Context(), true) assert.NoError(t, err) // Check if users exists @@ -279,7 +279,7 @@ func TestLDAPUserSyncWithEmptyUsernameAttribute(t *testing.T) { htmlDoc := NewHTMLParser(t, resp.Body) - tr := htmlDoc.doc.Find("table.table tbody tr") + tr := htmlDoc.doc.Find("table.table tbody tr:not(.no-results-row)") assert.Equal(t, 0, tr.Length()) } @@ -292,7 +292,7 @@ func TestLDAPUserSyncWithEmptyUsernameAttribute(t *testing.T) { MakeRequest(t, req, http.StatusSeeOther) } - require.NoError(t, auth.SyncExternalUsers(context.Background(), true)) + require.NoError(t, auth.SyncExternalUsers(t.Context(), true)) authSource := unittest.AssertExistsAndLoadBean(t, &auth_model.Source{ Name: payload["name"], @@ -328,7 +328,7 @@ func TestLDAPUserSyncWithGroupFilter(t *testing.T) { u := te.otherLDAPUsers[0] testLoginFailed(t, u.UserName, u.Password, translation.NewLocale("en-US").TrString("form.username_password_incorrect")) - require.NoError(t, auth.SyncExternalUsers(context.Background(), true)) + require.NoError(t, auth.SyncExternalUsers(t.Context(), true)) // Assert members of LDAP group "cn=git" are added for _, gitLDAPUser := range te.gitLDAPUsers { @@ -351,7 +351,7 @@ func TestLDAPUserSyncWithGroupFilter(t *testing.T) { ldapConfig.GroupFilter = "(cn=ship_crew)" require.NoError(t, auth_model.UpdateSource(db.DefaultContext, ldapSource)) - require.NoError(t, auth.SyncExternalUsers(context.Background(), true)) + require.NoError(t, auth.SyncExternalUsers(t.Context(), true)) for _, gitLDAPUser := range te.gitLDAPUsers { if gitLDAPUser.UserName == "fry" || gitLDAPUser.UserName == "leela" || gitLDAPUser.UserName == "bender" { @@ -392,7 +392,7 @@ func TestLDAPUserSSHKeySync(t *testing.T) { defer tests.PrepareTestEnv(t)() te.addAuthSource(t, ldapAuthOptions{attributeSSHPublicKey: "sshPublicKey"}) - require.NoError(t, auth.SyncExternalUsers(context.Background(), true)) + require.NoError(t, auth.SyncExternalUsers(t.Context(), true)) // Check if users has SSH keys synced for _, u := range te.gitLDAPUsers { @@ -432,14 +432,14 @@ func TestLDAPGroupTeamSyncAddMember(t *testing.T) { assert.NoError(t, err) team, err := organization.GetTeam(db.DefaultContext, org.ID, "team11") assert.NoError(t, err) - require.NoError(t, auth.SyncExternalUsers(context.Background(), true)) + require.NoError(t, auth.SyncExternalUsers(t.Context(), true)) for _, gitLDAPUser := range te.gitLDAPUsers { user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ Name: gitLDAPUser.UserName, }) usersOrgs, err := db.Find[organization.Organization](db.DefaultContext, organization.FindOrgOptions{ - UserID: user.ID, - IncludePrivate: true, + UserID: user.ID, + IncludeVisibility: structs.VisibleTypePrivate, }) assert.NoError(t, err) allOrgTeams, err := organization.GetUserOrgTeams(db.DefaultContext, org.ID, user.ID) |