Reduce differences in spec/support/helpers/ldap_helpers.rb

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

ee/spec/support/helpers/ee/ldap_helpers.rb

@@ -4,6 +4,12 @@ module EE
       EE::Gitlab::Auth::LDAP::Sync::Proxy.new(provider, adapter)
     end
 
+    def fake_ldap_sync_proxy(provider)
+      fake_proxy = double(:proxy, adapter: ldap_adapter)
+      allow(::EE::Gitlab::Auth::LDAP::Sync::Proxy).to receive(:open).with(provider).and_yield(fake_proxy)
+      fake_proxy
+    end
+
     # Stub an LDAP group search and provide the return entry. Specify `nil` for
     # `entry` to simulate when an LDAP group is not found
     #

spec/support/helpers/ldap_helpers.rb

 module LdapHelpers
-  include EE::LdapHelpers
-
   def ldap_adapter(provider = 'ldapmain', ldap = double(:ldap))
     ::Gitlab::Auth::LDAP::Adapter.new(provider, ldap)
   end
 
-  def fake_ldap_sync_proxy(provider)
-    fake_proxy = double(:proxy, adapter: ldap_adapter)
-    allow(::EE::Gitlab::Auth::LDAP::Sync::Proxy).to receive(:open).with(provider).and_yield(fake_proxy)
-    fake_proxy
-  end
-
   def user_dn(uid)
     "uid=#{uid},ou=users,dc=example,dc=com"
   end
@@ -76,3 +68,5 @@ module LdapHelpers
       .to receive(:ldap_search).and_raise(Gitlab::Auth::LDAP::LDAPConnectionError)
   end
 end
+
+LdapHelpers.include(EE::LdapHelpers)