Merge branch 'email_update_test' into 'master'

Email update test

spec/lib/gitlab/ldap/ldap_access_spec.rb

@@ -31,4 +31,31 @@ describe Gitlab::LDAP::Access do
       member.group_access.should == Gitlab::Access::DEVELOPER
     end
   end
+
+  describe :update_user_email do
+    let(:user_ldap) { create(:user, provider: 'ldap', extern_uid: "66048")}
+
+    it "should not update email if email attribute is not set" do
+      entry = Net::LDAP::Entry.new
+      Gitlab::LDAP::Adapter.any_instance.stub(:user) { Gitlab::LDAP::Person.new(entry) }
+      updated = access.update_email(user_ldap)
+      updated.should == false
+    end
+
+    it "should not update the email if the user has the same email in GitLab and in LDAP" do
+      entry = Net::LDAP::Entry.new
+      entry['mail'] = [user_ldap.email]
+      Gitlab::LDAP::Adapter.any_instance.stub(:user) { Gitlab::LDAP::Person.new(entry) }
+      updated = access.update_email(user_ldap)
+      updated.should == false
+    end
+
+    it "should update the email if the user email is different" do
+      entry = Net::LDAP::Entry.new
+      entry['mail'] = ["new_email@example.com"]
+      Gitlab::LDAP::Adapter.any_instance.stub(:user) { Gitlab::LDAP::Person.new(entry) }
+      updated = access.update_email(user_ldap)
+      updated.should == true
+    end
+  end
 end