lib/gitlab/qa/component/ldap.rb in gitlab-qa-2.7.3 vs lib/gitlab/qa/component/ldap.rb in gitlab-qa-2.8.0

@@ -28,12 +28,12 @@
         LDAP_PORT = 389
         LDAP_TLS_PORT = 636
         BASE_DN = 'dc=example,dc=org'.freeze
         BIND_DN = 'cn=admin,dc=example,dc=org'.freeze
         BOOTSTRAP_LDIF = '/container/service/slapd/assets/config/bootstrap/ldif/custom'.freeze
-        GROUP_BASE = 'ou=groups,dc=example,dc=org'.freeze
-        ADMIN_GROUP = 'admin'.freeze
+        GROUP_BASE = 'ou=Global Groups,dc=example,dc=org'.freeze
+        ADMIN_GROUP = 'AdminGroup'.freeze
         FIXTURE_PATH = File.expand_path('../../../../fixtures/ldap'.freeze, __dir__)
 
         attr_reader :docker
         attr_accessor :volumes, :network, :environment
         attr_writer :name
@@ -147,10 +147,10 @@
               host: #{hostname}
               port: #{tls? ? LDAP_TLS_PORT : LDAP_PORT}
               uid: 'uid'
               bind_dn: #{BIND_DN}
               password: #{ADMIN_PASSWORD}
-              method: #{tls? ? 'simple_tls' : 'plain'}
+              encryption: #{tls? ? 'simple_tls' : 'plain'}
               verify_certificates: false
               base: #{BASE_DN}
               user_filter: ''
               group_base: #{GROUP_BASE}
               admin_group: #{ADMIN_GROUP}