lib/gitlab/qa/scenario/test/integration/ldap.rb in gitlab-qa-11.3.0 vs lib/gitlab/qa/scenario/test/integration/ldap.rb in gitlab-qa-12.0.0

@@ -64,20 +64,18 @@
                   specs.volumes = volumes
                 end
               end
             end
 
-            def orchestrate_ldap
+            def orchestrate_ldap(&block)
               Component::LDAP.perform do |ldap|
                 ldap.name = 'ldap-server'
                 ldap.network = 'test'
                 ldap.set_gitlab_credentials
                 ldap.tls = tls
 
-                ldap.instance do
-                  yield
-                end
+                ldap.instance(&block)
               end
             end
 
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
@@ -88,11 +86,12 @@
                 configure_omnibus(gitlab)
 
                 if orchestrate_ldap_server
                   orchestrate_ldap { run_specs(gitlab, {}, *rspec_args) }
                 else
-                  volumes = { 'admin': File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'qa/fixtures/ldap/admin'),
-                              'non_admin': File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'qa/fixtures/ldap/non_admin') }
+                  volumes = { admin: File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'qa/fixtures/ldap/admin'),
+                              non_admin: File.join(Docker::Volumes::QA_CONTAINER_WORKDIR,
+                                'qa/fixtures/ldap/non_admin') }
                   run_specs(gitlab, volumes, *rspec_args)
                 end
               end
             end
           end