1 files changed, 240 insertions, 130 deletions

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 0250014bc21..10e90cae143 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2,79 +2,85 @@
 #
 # Table name: users
 #
-#  id                       :integer          not null, primary key
-#  email                    :string(255)      default(""), not null
-#  encrypted_password       :string(255)      default(""), not null
-#  reset_password_token     :string(255)
-#  reset_password_sent_at   :datetime
-#  remember_created_at      :datetime
-#  sign_in_count            :integer          default(0)
-#  current_sign_in_at       :datetime
-#  last_sign_in_at          :datetime
-#  current_sign_in_ip       :string(255)
-#  last_sign_in_ip          :string(255)
-#  created_at               :datetime
-#  updated_at               :datetime
-#  name                     :string(255)
-#  admin                    :boolean          default(FALSE), not null
-#  projects_limit           :integer          default(10)
-#  skype                    :string(255)      default(""), not null
-#  linkedin                 :string(255)      default(""), not null
-#  twitter                  :string(255)      default(""), not null
-#  authentication_token     :string(255)
-#  theme_id                 :integer          default(1), not null
-#  bio                      :string(255)
-#  failed_attempts          :integer          default(0)
-#  locked_at                :datetime
-#  extern_uid               :string(255)
-#  provider                 :string(255)
-#  username                 :string(255)
-#  can_create_group         :boolean          default(TRUE), not null
-#  can_create_team          :boolean          default(TRUE), not null
-#  state                    :string(255)
-#  color_scheme_id          :integer          default(1), not null
-#  notification_level       :integer          default(1), not null
-#  password_expires_at      :datetime
-#  created_by_id            :integer
-#  last_credential_check_at :datetime
-#  avatar                   :string(255)
-#  confirmation_token       :string(255)
-#  confirmed_at             :datetime
-#  confirmation_sent_at     :datetime
-#  unconfirmed_email        :string(255)
-#  hide_no_ssh_key          :boolean          default(FALSE)
-#  website_url              :string(255)      default(""), not null
+#  id                            :integer          not null, primary key
+#  email                         :string(255)      default(""), not null
+#  encrypted_password            :string(255)      default(""), not null
+#  reset_password_token          :string(255)
+#  reset_password_sent_at        :datetime
+#  remember_created_at           :datetime
+#  sign_in_count                 :integer          default(0)
+#  current_sign_in_at            :datetime
+#  last_sign_in_at               :datetime
+#  current_sign_in_ip            :string(255)
+#  last_sign_in_ip               :string(255)
+#  created_at                    :datetime
+#  updated_at                    :datetime
+#  name                          :string(255)
+#  admin                         :boolean          default(FALSE), not null
+#  projects_limit                :integer          default(10)
+#  skype                         :string(255)      default(""), not null
+#  linkedin                      :string(255)      default(""), not null
+#  twitter                       :string(255)      default(""), not null
+#  authentication_token          :string(255)
+#  theme_id                      :integer          default(1), not null
+#  bio                           :string(255)
+#  failed_attempts               :integer          default(0)
+#  locked_at                     :datetime
+#  username                      :string(255)
+#  can_create_group              :boolean          default(TRUE), not null
+#  can_create_team               :boolean          default(TRUE), not null
+#  state                         :string(255)
+#  color_scheme_id               :integer          default(1), not null
+#  notification_level            :integer          default(1), not null
+#  password_expires_at           :datetime
+#  created_by_id                 :integer
+#  last_credential_check_at      :datetime
+#  avatar                        :string(255)
+#  confirmation_token            :string(255)
+#  confirmed_at                  :datetime
+#  confirmation_sent_at          :datetime
+#  unconfirmed_email             :string(255)
+#  hide_no_ssh_key               :boolean          default(FALSE)
+#  website_url                   :string(255)      default(""), not null
+#  github_access_token           :string(255)
+#  gitlab_access_token           :string(255)
+#  notification_email            :string(255)
+#  hide_no_password              :boolean          default(FALSE)
+#  password_automatically_set    :boolean          default(FALSE)
+#  bitbucket_access_token        :string(255)
+#  bitbucket_access_token_secret :string(255)
 #
 
 require 'spec_helper'
 
 describe User do
   describe "Associations" do
-    it { should have_one(:namespace) }
-    it { should have_many(:snippets).class_name('Snippet').dependent(:destroy) }
-    it { should have_many(:project_members).dependent(:destroy) }
-    it { should have_many(:groups) }
-    it { should have_many(:keys).dependent(:destroy) }
-    it { should have_many(:events).class_name('Event').dependent(:destroy) }
-    it { should have_many(:recent_events).class_name('Event') }
-    it { should have_many(:issues).dependent(:destroy) }
-    it { should have_many(:notes).dependent(:destroy) }
-    it { should have_many(:assigned_issues).dependent(:destroy) }
-    it { should have_many(:merge_requests).dependent(:destroy) }
-    it { should have_many(:assigned_merge_requests).dependent(:destroy) }
+    it { is_expected.to have_one(:namespace) }
+    it { is_expected.to have_many(:snippets).class_name('Snippet').dependent(:destroy) }
+    it { is_expected.to have_many(:project_members).dependent(:destroy) }
+    it { is_expected.to have_many(:groups) }
+    it { is_expected.to have_many(:keys).dependent(:destroy) }
+    it { is_expected.to have_many(:events).class_name('Event').dependent(:destroy) }
+    it { is_expected.to have_many(:recent_events).class_name('Event') }
+    it { is_expected.to have_many(:issues).dependent(:destroy) }
+    it { is_expected.to have_many(:notes).dependent(:destroy) }
+    it { is_expected.to have_many(:assigned_issues).dependent(:destroy) }
+    it { is_expected.to have_many(:merge_requests).dependent(:destroy) }
+    it { is_expected.to have_many(:assigned_merge_requests).dependent(:destroy) }
+    it { is_expected.to have_many(:identities).dependent(:destroy) }
   end
 
   describe "Mass assignment" do
   end
 
   describe 'validations' do
-    it { should validate_presence_of(:username) }
-    it { should validate_presence_of(:projects_limit) }
-    it { should validate_numericality_of(:projects_limit) }
-    it { should allow_value(0).for(:projects_limit) }
-    it { should_not allow_value(-1).for(:projects_limit) }
+    it { is_expected.to validate_presence_of(:username) }
+    it { is_expected.to validate_presence_of(:projects_limit) }
+    it { is_expected.to validate_numericality_of(:projects_limit) }
+    it { is_expected.to allow_value(0).for(:projects_limit) }
+    it { is_expected.not_to allow_value(-1).for(:projects_limit) }
 
-    it { should ensure_length_of(:bio).is_within(0..255) }
+    it { is_expected.to ensure_length_of(:bio).is_within(0..255) }
 
     describe 'email' do
       it 'accepts info@example.com' do
@@ -110,34 +116,34 @@ describe User do
   end
 
   describe "Respond to" do
-    it { should respond_to(:is_admin?) }
-    it { should respond_to(:name) }
-    it { should respond_to(:private_token) }
+    it { is_expected.to respond_to(:is_admin?) }
+    it { is_expected.to respond_to(:name) }
+    it { is_expected.to respond_to(:private_token) }
   end
 
   describe '#generate_password' do
     it "should execute callback when force_random_password specified" do
       user = build(:user, force_random_password: true)
-      user.should_receive(:generate_password)
+      expect(user).to receive(:generate_password)
       user.save
     end
 
     it "should not generate password by default" do
       user = create(:user, password: 'abcdefghe')
-      user.password.should == 'abcdefghe'
+      expect(user.password).to eq('abcdefghe')
     end
 
     it "should generate password when forcing random password" do
-      Devise.stub(:friendly_token).and_return('123456789')
+      allow(Devise).to receive(:friendly_token).and_return('123456789')
       user = create(:user, password: 'abcdefg', force_random_password: true)
-      user.password.should == '12345678'
+      expect(user.password).to eq('12345678')
     end
   end
 
   describe 'authentication token' do
     it "should have authentication token" do
       user = create(:user)
-      user.authentication_token.should_not be_blank
+      expect(user.authentication_token).not_to be_blank
     end
   end
 
@@ -152,15 +158,15 @@ describe User do
       @project_3.team << [@user, :developer]
     end
 
-    it { @user.authorized_projects.should include(@project) }
-    it { @user.authorized_projects.should include(@project_2) }
-    it { @user.authorized_projects.should include(@project_3) }
-    it { @user.owned_projects.should include(@project) }
-    it { @user.owned_projects.should_not include(@project_2) }
-    it { @user.owned_projects.should_not include(@project_3) }
-    it { @user.personal_projects.should include(@project) }
-    it { @user.personal_projects.should_not include(@project_2) }
-    it { @user.personal_projects.should_not include(@project_3) }
+    it { expect(@user.authorized_projects).to include(@project) }
+    it { expect(@user.authorized_projects).to include(@project_2) }
+    it { expect(@user.authorized_projects).to include(@project_3) }
+    it { expect(@user.owned_projects).to include(@project) }
+    it { expect(@user.owned_projects).not_to include(@project_2) }
+    it { expect(@user.owned_projects).not_to include(@project_3) }
+    it { expect(@user.personal_projects).to include(@project) }
+    it { expect(@user.personal_projects).not_to include(@project_2) }
+    it { expect(@user.personal_projects).not_to include(@project_3) }
   end
 
   describe 'groups' do
@@ -170,9 +176,9 @@ describe User do
       @group.add_owner(@user)
     end
 
-    it { @user.several_namespaces?.should be_true }
-    it { @user.authorized_groups.should == [@group] }
-    it { @user.owned_groups.should == [@group] }
+    it { expect(@user.several_namespaces?).to be_truthy }
+    it { expect(@user.authorized_groups).to eq([@group]) }
+    it { expect(@user.owned_groups).to eq([@group]) }
   end
 
   describe 'group multiple owners' do
@@ -185,7 +191,7 @@ describe User do
       @group.add_user(@user2, GroupMember::OWNER)
     end
 
-    it { @user2.several_namespaces?.should be_true }
+    it { expect(@user2.several_namespaces?).to be_truthy }
   end
 
   describe 'namespaced' do
@@ -194,7 +200,7 @@ describe User do
       @project = create :project, namespace: @user.namespace
     end
 
-    it { @user.several_namespaces?.should be_false }
+    it { expect(@user.several_namespaces?).to be_falsey }
   end
 
   describe 'blocking user' do
@@ -202,7 +208,7 @@ describe User do
 
     it "should block user" do
       user.block
-      user.blocked?.should be_true
+      expect(user.blocked?).to be_truthy
     end
   end
 
@@ -214,10 +220,10 @@ describe User do
       @blocked = create :user, state: :blocked
     end
 
-    it { User.filter("admins").should == [@admin] }
-    it { User.filter("blocked").should == [@blocked] }
-    it { User.filter("wop").should include(@user, @admin, @blocked) }
-    it { User.filter(nil).should include(@user, @admin) }
+    it { expect(User.filter("admins")).to eq([@admin]) }
+    it { expect(User.filter("blocked")).to eq([@blocked]) }
+    it { expect(User.filter("wop")).to include(@user, @admin, @blocked) }
+    it { expect(User.filter(nil)).to include(@user, @admin) }
   end
 
   describe :not_in_project do
@@ -227,27 +233,27 @@ describe User do
       @project = create :project
     end
 
-    it { User.not_in_project(@project).should include(@user, @project.owner) }
+    it { expect(User.not_in_project(@project)).to include(@user, @project.owner) }
   end
 
   describe 'user creation' do
     describe 'normal user' do
       let(:user) { create(:user, name: 'John Smith') }
 
-      it { user.is_admin?.should be_false }
-      it { user.require_ssh_key?.should be_true }
-      it { user.can_create_group?.should be_true }
-      it { user.can_create_project?.should be_true }
-      it { user.first_name.should == 'John' }
+      it { expect(user.is_admin?).to be_falsey }
+      it { expect(user.require_ssh_key?).to be_truthy }
+      it { expect(user.can_create_group?).to be_truthy }
+      it { expect(user.can_create_project?).to be_truthy }
+      it { expect(user.first_name).to eq('John') }
     end
 
     describe 'with defaults' do
       let(:user) { User.new }
 
       it "should apply defaults to user" do
-        user.projects_limit.should == Gitlab.config.gitlab.default_projects_limit
-        user.can_create_group.should == Gitlab.config.gitlab.default_can_create_group
-        user.theme_id.should == Gitlab.config.gitlab.default_theme
+        expect(user.projects_limit).to eq(Gitlab.config.gitlab.default_projects_limit)
+        expect(user.can_create_group).to eq(Gitlab.config.gitlab.default_can_create_group)
+        expect(user.theme_id).to eq(Gitlab.config.gitlab.default_theme)
       end
     end
 
@@ -255,9 +261,9 @@ describe User do
       let(:user) { User.new(projects_limit: 123, can_create_group: false, can_create_team: true, theme_id: Gitlab::Theme::BASIC) }
 
       it "should apply defaults to user" do
-        user.projects_limit.should == 123
-        user.can_create_group.should be_false
-        user.theme_id.should == Gitlab::Theme::BASIC
+        expect(user.projects_limit).to eq(123)
+        expect(user.can_create_group).to be_falsey
+        expect(user.theme_id).to eq(Gitlab::Theme::BASIC)
       end
     end
   end
@@ -267,12 +273,12 @@ describe User do
     let(:user2) { create(:user, username: 'jameson', email: 'jameson@example.com') }
 
     it "should be case insensitive" do
-      User.search(user1.username.upcase).to_a.should == [user1]
-      User.search(user1.username.downcase).to_a.should == [user1]
-      User.search(user2.username.upcase).to_a.should == [user2]
-      User.search(user2.username.downcase).to_a.should == [user2]
-      User.search(user1.username.downcase).to_a.count.should == 2
-      User.search(user2.username.downcase).to_a.count.should == 1
+      expect(User.search(user1.username.upcase).to_a).to eq([user1])
+      expect(User.search(user1.username.downcase).to_a).to eq([user1])
+      expect(User.search(user2.username.upcase).to_a).to eq([user2])
+      expect(User.search(user2.username.downcase).to_a).to eq([user2])
+      expect(User.search(user1.username.downcase).to_a.count).to eq(2)
+      expect(User.search(user2.username.downcase).to_a.count).to eq(1)
     end
   end
 
@@ -280,21 +286,45 @@ describe User do
     let(:user1) { create(:user, username: 'foo') }
 
     it "should get the correct user" do
-      User.by_username_or_id(user1.id).should == user1
-      User.by_username_or_id('foo').should == user1
-      User.by_username_or_id(-1).should be_nil
-      User.by_username_or_id('bar').should be_nil
+      expect(User.by_username_or_id(user1.id)).to eq(user1)
+      expect(User.by_username_or_id('foo')).to eq(user1)
+      expect(User.by_username_or_id(-1)).to be_nil
+      expect(User.by_username_or_id('bar')).to be_nil
+    end
+  end
+
+  describe '.by_login' do
+    let(:username) { 'John' }
+    let!(:user) { create(:user, username: username) }
+
+    it 'should get the correct user' do
+      expect(User.by_login(user.email.upcase)).to eq user
+      expect(User.by_login(user.email)).to eq user
+      expect(User.by_login(username.downcase)).to eq user
+      expect(User.by_login(username)).to eq user
+      expect(User.by_login(nil)).to be_nil
+      expect(User.by_login('')).to be_nil
+    end
+  end
+
+  describe ".clean_username" do
+
+    let!(:user) { create(:user, username: "johngitlab-etc") }
+    let!(:namespace) { create(:namespace, path: "JohnGitLab-etc1") }
+
+    it "cleans a username and makes sure it's available" do
+      expect(User.clean_username("-john+gitlab-ETC%.git@gmail.com")).to eq("johngitlab-ETC2")
     end
   end
 
   describe 'all_ssh_keys' do
-    it { should have_many(:keys).dependent(:destroy) }
+    it { is_expected.to have_many(:keys).dependent(:destroy) }
 
     it "should have all ssh keys" do
       user = create :user
       key = create :key, key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD33bWLBxu48Sev9Fert1yzEO4WGcWglWF7K/AwblIUFselOt/QdOL9DSjpQGxLagO1s9wl53STIO8qGS4Ms0EJZyIXOEFMjFJ5xmjSy+S37By4sG7SsltQEHMxtbtFOaW5LV2wCrX+rUsRNqLMamZjgjcPO0/EgGCXIGMAYW4O7cwGZdXWYIhQ1Vwy+CsVMDdPkPgBXqK7nR/ey8KMs8ho5fMNgB5hBw/AL9fNGhRw3QTD6Q12Nkhl4VZES2EsZqlpNnJttnPdp847DUsT6yuLRlfiQfz5Cn9ysHFdXObMN5VYIiPFwHeYCZp1X2S4fDZooRE8uOLTfxWHPXwrhqSH", user_id: user.id
 
-      user.all_ssh_keys.should include(key.key)
+      expect(user.all_ssh_keys).to include(key.key)
     end
   end
 
@@ -303,12 +333,12 @@ describe User do
 
     it "should be true if avatar is image" do
       user.update_attribute(:avatar, 'uploads/avatar.png')
-      user.avatar_type.should be_true
+      expect(user.avatar_type).to be_truthy
     end
 
     it "should be false if avatar is html page" do
       user.update_attribute(:avatar, 'uploads/avatar.html')
-      user.avatar_type.should == ["only images allowed"]
+      expect(user.avatar_type).to eq(["only images allowed"])
     end
   end
 
@@ -319,7 +349,7 @@ describe User do
       # Create a condition which would otherwise cause 'true' to be returned
       user.stub(ldap_user?: true)
       user.last_credential_check_at = nil
-      expect(user.requires_ldap_check?).to be_false
+      expect(user.requires_ldap_check?).to be_falsey
     end
 
     context 'when LDAP is enabled' do
@@ -327,7 +357,7 @@ describe User do
 
       it 'is false for non-LDAP users' do
         user.stub(ldap_user?: false)
-        expect(user.requires_ldap_check?).to be_false
+        expect(user.requires_ldap_check?).to be_falsey
       end
 
       context 'and when the user is an LDAP user' do
@@ -335,17 +365,41 @@ describe User do
 
         it 'is true when the user has never had an LDAP check before' do
           user.last_credential_check_at = nil
-          expect(user.requires_ldap_check?).to be_true
+          expect(user.requires_ldap_check?).to be_truthy
         end
 
         it 'is true when the last LDAP check happened over 1 hour ago' do
           user.last_credential_check_at = 2.hours.ago
-          expect(user.requires_ldap_check?).to be_true
+          expect(user.requires_ldap_check?).to be_truthy
         end
       end
     end
   end
 
+  describe :ldap_user? do
+    it "is true if provider name starts with ldap" do
+      user = create(:omniauth_user, provider: 'ldapmain')
+      expect( user.ldap_user? ).to be_truthy
+    end
+
+    it "is false for other providers" do
+      user = create(:omniauth_user, provider: 'other-provider')
+      expect( user.ldap_user? ).to be_falsey
+    end
+
+    it "is false if no extern_uid is provided" do
+      user = create(:omniauth_user, extern_uid: nil)
+      expect( user.ldap_user? ).to be_falsey
+    end
+  end
+
+  describe :ldap_identity do
+    it "returns ldap identity" do
+      user = create :omniauth_user
+      expect(user.ldap_identity.provider).not_to be_empty
+    end
+  end
+
   describe '#full_website_url' do
     let(:user) { create(:user) }
 
@@ -396,24 +450,24 @@ describe User do
       project1 = create :project, :public
       project2 = create :project, :public
 
-      expect(user.starred?(project1)).to be_false
-      expect(user.starred?(project2)).to be_false
+      expect(user.starred?(project1)).to be_falsey
+      expect(user.starred?(project2)).to be_falsey
 
       star1 = UsersStarProject.create!(project: project1, user: user)
-      expect(user.starred?(project1)).to be_true
-      expect(user.starred?(project2)).to be_false
+      expect(user.starred?(project1)).to be_truthy
+      expect(user.starred?(project2)).to be_falsey
 
       star2 = UsersStarProject.create!(project: project2, user: user)
-      expect(user.starred?(project1)).to be_true
-      expect(user.starred?(project2)).to be_true
+      expect(user.starred?(project1)).to be_truthy
+      expect(user.starred?(project2)).to be_truthy
 
       star1.destroy
-      expect(user.starred?(project1)).to be_false
-      expect(user.starred?(project2)).to be_true
+      expect(user.starred?(project1)).to be_falsey
+      expect(user.starred?(project2)).to be_truthy
 
       star2.destroy
-      expect(user.starred?(project1)).to be_false
-      expect(user.starred?(project2)).to be_false
+      expect(user.starred?(project1)).to be_falsey
+      expect(user.starred?(project2)).to be_falsey
     end
   end
 
@@ -422,11 +476,67 @@ describe User do
       user = create :user
       project = create :project, :public
 
-      expect(user.starred?(project)).to be_false
+      expect(user.starred?(project)).to be_falsey
       user.toggle_star(project)
-      expect(user.starred?(project)).to be_true
+      expect(user.starred?(project)).to be_truthy
       user.toggle_star(project)
-      expect(user.starred?(project)).to be_false
+      expect(user.starred?(project)).to be_falsey
+    end
+  end
+
+  describe "#sort" do
+    before do
+      User.delete_all
+      @user = create :user, created_at: Date.today, last_sign_in_at: Date.today, name: 'Alpha'
+      @user1 = create :user, created_at: Date.today - 1, last_sign_in_at: Date.today - 1, name: 'Omega'
+    end
+
+    it "sorts users as recently_signed_in" do
+      expect(User.sort('recent_sign_in').first).to eq(@user)
+    end
+
+    it "sorts users as late_signed_in" do
+      expect(User.sort('oldest_sign_in').first).to eq(@user1)
+    end
+
+    it "sorts users as recently_created" do
+      expect(User.sort('created_desc').first).to eq(@user)
+    end
+
+    it "sorts users as late_created" do
+      expect(User.sort('created_asc').first).to eq(@user1)
+    end
+
+    it "sorts users by name when nil is passed" do
+      expect(User.sort(nil).first).to eq(@user)
+    end
+  end
+
+  describe "#contributed_projects_ids" do
+
+    subject { create(:user) }
+    let!(:project1) { create(:project) }
+    let!(:project2) { create(:project, forked_from_project: project3) }
+    let!(:project3) { create(:project) }
+    let!(:merge_request) { create(:merge_request, source_project: project2, target_project: project3, author: subject) }
+    let!(:push_event) { create(:event, action: Event::PUSHED, project: project1, target: project1, author: subject) }
+    let!(:merge_event) { create(:event, action: Event::CREATED, project: project3, target: merge_request, author: subject) }
+
+    before do
+      project1.team << [subject, :master]
+      project2.team << [subject, :master]
+    end
+
+    it "includes IDs for projects the user has pushed to" do
+      expect(subject.contributed_projects_ids).to include(project1.id)
+    end
+
+    it "includes IDs for projects the user has had merge requests merged into" do
+      expect(subject.contributed_projects_ids).to include(project3.id)
+    end
+
+    it "doesn't include IDs for unrelated projects" do
+      expect(subject.contributed_projects_ids).not_to include(project2.id)
     end
   end
 end