fix specs after merge CE -> EE

app/models/members/group_member.rb

@@ -26,8 +26,7 @@ class GroupMember < Member
 
   scope :with_group, ->(group) { where(source_id: group.id) }
   scope :with_user, ->(user) { where(user_id: user.id) }
-  scope :with_ldap_dn, -> { references(:user).includes(:user).
-        where(users: { provider: 'ldap' }) }
+  scope :with_ldap_dn, -> { joins(user: :identities).where("identities.provider LIKE ?", 'ldap%') }
 
   after_create :notify_create
   after_update :notify_update

lib/gitlab/ldap/access.rb

@@ -54,7 +54,7 @@ module Gitlab
       end
 
       def ldap_user
-        @ldap_user ||= Gitlab::LDAP::Person.find_by_dn(user.extern_uid, adapter)
+        @ldap_user ||= Gitlab::LDAP::Person.find_by_dn(user.ldap_identity.extern_uid, adapter)
       end
 
       def update_permissions
@@ -110,7 +110,7 @@ module Gitlab
 
       def update_admin_status
         admin_group = Gitlab::LDAP::Group.find_by_cn(ldap_config.admin_group, adapter)
-        if admin_group.has_member?(Gitlab::LDAP::Person.find_by_dn(user.extern_uid, adapter))
+        if admin_group.has_member?(Gitlab::LDAP::Person.find_by_dn(user.ldap_identity.extern_uid, adapter))
           unless user.admin?
             user.admin = true
             user.save

spec/lib/gitlab/ldap/access_spec.rb

@@ -129,7 +129,7 @@ describe Gitlab::LDAP::Access do
     let(:entry) { Net::LDAP::Entry.new }
 
     before do
-      access.stub ldap_user: Gitlab::LDAP::Person.new(entry, user.provider)
+      access.stub ldap_user: Gitlab::LDAP::Person.new(entry, user.ldap_identity.provider)
     end
 
     it "should not update email if email attribute is not set" do
@@ -157,7 +157,7 @@ describe Gitlab::LDAP::Access do
     before do
       access.stub(admin_group: "GLAdmins")
       ldap_user_entry = Net::LDAP::Entry.new
-      Gitlab::LDAP::Adapter.any_instance.stub(:user) { Gitlab::LDAP::Person.new(ldap_user_entry, user.provider) }
+      Gitlab::LDAP::Adapter.any_instance.stub(:user) { Gitlab::LDAP::Person.new(ldap_user_entry, user.ldap_identity.provider) }
       Gitlab::LDAP::Person.any_instance.stub(:uid) { 'admin2' }
     end
 
@@ -319,7 +319,7 @@ objectclass: posixGroup
         Gitlab::LDAP::Group.new(ldap_group_response_2)
       ]
     end
-    let(:ldap_user) { Gitlab::LDAP::Person.new(Net::LDAP::Entry.new, user.provider) }
+    let(:ldap_user) { Gitlab::LDAP::Person.new(Net::LDAP::Entry.new, user.ldap_identity.provider) }
 
     before do
       access.stub(ldap_user: ldap_user)

spec/services/ldap_group_reset_service_spec.rb

@@ -4,8 +4,8 @@ describe LdapGroupResetService do
   # TODO: refactor to multi-ldap setup
   let(:group) { create(:group) }
   let(:user) { create(:user) }
-  let(:ldap_user) { create(:user, extern_uid: 'john', provider: 'ldap', last_credential_check_at: Time.now) }
-  let(:ldap_user_2) { create(:user, extern_uid: 'mike', provider: 'ldap', last_credential_check_at: Time.now) }
+  let(:ldap_user) { create(:omniauth_user, extern_uid: 'john', provider: 'ldap', last_credential_check_at: Time.now) }
+  let(:ldap_user_2) { create(:omniauth_user, extern_uid: 'mike', provider: 'ldap', last_credential_check_at: Time.now) }
 
   before do
     group.add_owner(user)