Skip to content

Commit 51c45c0

Browse files
committed
fix tests and typo
1 parent 2c5d990 commit 51c45c0

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

cmd/admin_auth_ldap.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@ var (
138138
},
139139
&cli.StringFlag{
140140
Name: "group-member-uid",
141-
Usage: "Group attribte containing list of users",
141+
Usage: "Group attribute containing list of users",
142142
},
143143
&cli.StringFlag{
144144
Name: "group-user-attribute",
145-
Usage: "User attribte listed in group",
145+
Usage: "User attribute listed in group",
146146
},
147147
&cli.StringFlag{
148148
Name: "group-filter",

cmd/admin_auth_ldap_test.go

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ func TestAddLdapBindDn(t *testing.T) {
5151
"--attributes-in-bind",
5252
"--synchronize-users",
5353
"--page-size", "99",
54-
"--enable-groups", "true",
54+
"--enable-groups",
5555
"--group-search-base", "ou=group,dc=full-domain-bind,dc=org",
5656
"--group-member-uid", "memberUid",
5757
"--group-user-attribute", "uid",
58-
"--group-filter", "(|(cn=gitea_user)(cn=admins))",
58+
"--group-filter", "(|(cn=gitea_users)(cn=admins))",
5959
"--group-team-map", `{"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}`,
6060
"--group-users-remove", "true",
6161
},
@@ -524,6 +524,13 @@ func TestUpdateLdapBindDn(t *testing.T) {
524524
"--bind-password", "secret-bind-full",
525525
"--synchronize-users",
526526
"--page-size", "99",
527+
"--enable-groups",
528+
"--group-search-base", "ou=group,dc=full-domain-bind,dc=org",
529+
"--group-member-uid", "memberUid",
530+
"--group-user-attribute", "uid",
531+
"--group-filter", "(|(cn=gitea_users)(cn=admins))",
532+
"--group-team-map", `{"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}`,
533+
"--group-users-remove", "true",
527534
},
528535
id: 23,
529536
existingAuthSource: &auth.Source{
@@ -559,6 +566,13 @@ func TestUpdateLdapBindDn(t *testing.T) {
559566
AdminFilter: "(memberOf=cn=admin-group,ou=example,dc=full-domain-bind,dc=org)",
560567
RestrictedFilter: "(memberOf=cn=restricted-group,ou=example,dc=full-domain-bind,dc=org)",
561568
Enabled: true,
569+
GroupsEnabled: true,
570+
GroupDN: "ou=group,dc=full-domain-bind,dc=org",
571+
GroupMemberUID: "memberUid",
572+
UserUID: "uid",
573+
GroupFilter: "(|(cn=gitea_users)(cn=admins))",
574+
GroupTeamMap: `{"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}`,
575+
GroupTeamMapRemoval: true,
562576
},
563577
},
564578
},

0 commit comments

Comments
 (0)