Maintenance: Include new zammad-ldap container for testing.

zammad · Aug 31, 2023 · bcb37f9 · bcb37f9
1 parent 8983944
commit bcb37f9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.gitlab/ci/__includes__/services.yml b/.gitlab/ci/__includes__/services.yml
@@ -105,3 +105,7 @@
   ftp:
     name: $CI_REGISTRY/docker/zammad-ftp:stable
     alias: ci-service-ftp
+
+  ldap:
+    name: $CI_REGISTRY/docker/zammad-ldap:stable
+    alias: ci-service-ldap
diff --git a/.gitlab/ci/test/rspec.yml b/.gitlab/ci/test/rspec.yml
@@ -32,6 +32,7 @@ rspec:integration:
     - !reference [.services, proxy]
     - !reference [.services, ftp]
     - !reference [.services, mattermost]
+    - !reference [.services, ldap]
   script:
     - !reference [.scripts, zammad_db_init]
     - bundle exec rspec --exclude-pattern "spec/system/**/*_spec.rb" -t integration -t ~integration_standalone --profile 10
diff --git a/spec/factories/ldap_source.rb b/spec/factories/ldap_source.rb
@@ -10,7 +10,7 @@
     trait :with_config do
       preferences do
         {
-          'host_url'         => ENV['IMPORT_LDAP_ENDPOINT'],
+          'host_url'         => "ldap://#{ENV['IMPORT_LDAP_ENDPOINT']}",
           'options'          => { 'dc=foo,dc=example,dc=com'=>'dc=foo,dc=example,dc=com' },
           'option'           => 'dc=foo,dc=example,dc=com',
           'base_dn'          => 'dc=foo,dc=example,dc=com',