From 54299f4e66085b9ed6da914167e324bf69bbb9b8 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 22 May 2019 12:48:12 +0200 Subject: [PATCH] set the ldapGroupMemberAssocAttr for group tests Signed-off-by: Arthur Schiwon --- .../ldap_features/ldap-openldap.feature | 15 +++++++++------ .../ldap_features/openldap-numerical-id.feature | 1 + 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/build/integration/ldap_features/ldap-openldap.feature b/build/integration/ldap_features/ldap-openldap.feature index 6c5ed8b462..570cf287a2 100644 --- a/build/integration/ldap_features/ldap-openldap.feature +++ b/build/integration/ldap_features/ldap-openldap.feature @@ -42,8 +42,9 @@ Feature: LDAP Scenario: Test group filter with one specific group Given modify LDAP configuration - | ldapGroupFilter | cn=RedGroup | - | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci | + | ldapGroupFilter | cn=RedGroup | + | ldapGroupMemberAssocAttr | member | + | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci | And As an "admin" And sending "GET" to "/cloud/groups" Then the OCS status code should be "200" @@ -55,8 +56,9 @@ Feature: LDAP Scenario: Test group filter with two specific groups Given modify LDAP configuration - | ldapGroupFilter | (\|(cn=RedGroup)(cn=GreenGroup)) | - | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci | + | ldapGroupFilter | (\|(cn=RedGroup)(cn=GreenGroup)) | + | ldapGroupMemberAssocAttr | member | + | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci | And As an "admin" And sending "GET" to "/cloud/groups" Then the OCS status code should be "200" @@ -68,8 +70,9 @@ Feature: LDAP Scenario: Test group filter ruling out a group from a different base Given modify LDAP configuration - | ldapGroupFilter | (objectClass=groupOfNames) | - | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci | + | ldapGroupFilter | (objectClass=groupOfNames) | + | ldapGroupMemberAssocAttr | member | + | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci | And As an "admin" And sending "GET" to "/cloud/groups" Then the OCS status code should be "200" diff --git a/build/integration/ldap_features/openldap-numerical-id.feature b/build/integration/ldap_features/openldap-numerical-id.feature index 4112df0ae1..4ea6382329 100644 --- a/build/integration/ldap_features/openldap-numerical-id.feature +++ b/build/integration/ldap_features/openldap-numerical-id.feature @@ -35,6 +35,7 @@ Scenario: Test LDAP group retrieval with numeric group ids and nesting Given modify LDAP configuration | ldapBaseGroups | ou=NumericGroups,dc=nextcloud,dc=ci | | ldapGroupFilter | (objectclass=groupOfNames) | + | ldapGroupMemberAssocAttr | member | | ldapNestedGroups | 1 | | useMemberOfToDetectMembership | 1 | And As an "admin"