Extract EE-specific lines to EE::Gitlab::Auth::LDAP::Config

Signed-off-by: Rémy Coutable <remy@rymai.me>

ee/lib/ee/gitlab/auth/ldap/config.rb

@@ -6,9 +6,16 @@ module EE
           extend ActiveSupport::Concern
 
           class_methods do
+            extend ::Gitlab::Utils::Override
+
             def group_sync_enabled?
               enabled? && ::License.feature_available?(:ldap_group_sync)
             end
+
+            override :_available_servers
+            def _available_servers
+              ::License.feature_available?(:multiple_ldap_servers) ? servers : super
+            end
           end
         end
       end

lib/gitlab/auth/ldap/config.rb

@@ -3,7 +3,7 @@ module Gitlab
   module Auth
     module LDAP
       class Config
-        include ::EE::Gitlab::Auth::LDAP::Config
+        prepend ::EE::Gitlab::Auth::LDAP::Config
 
         NET_LDAP_ENCRYPTION_METHOD = {
           simple_tls: :simple_tls,
@@ -26,7 +26,11 @@ module Gitlab
         def self.available_servers
           return [] unless enabled?
 
-          ::License.feature_available?(:multiple_ldap_servers) ? servers : Array.wrap(servers.first)
+          _available_servers
+        end
+
+        def self._available_servers
+          Array.wrap(servers.first)
         end
 
         def self.providers

spec/lib/gitlab/auth/ldap/config_spec.rb

@@ -23,7 +23,7 @@ describe Gitlab::Auth::LDAP::Config do
     end
 
     it 'raises an error if a unknown provider is used' do
-      expect { described_class.new 'unknown' }.to raise_error(Gitlab::Auth::LDAP::Config::InvalidProvider)
+      expect { described_class.new 'unknown' }.to raise_error(described_class::InvalidProvider)
     end
   end