diff options
author | Rémy Coutable <remy@rymai.me> | 2018-02-06 09:18:42 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-02-06 09:18:42 +0000 |
commit | 9483cbab26ad239c7a102f887177aaf354c9d13c (patch) | |
tree | 8a9c8b3e648fd1b5442c241b38473cb0e13afb93 /spec/models/user_spec.rb | |
parent | 84bda43a3c0ce13a436748d0bc0ea943f6ebccb3 (diff) | |
parent | cca13d1e40812b60462461ca4387324778654960 (diff) | |
download | gitlab-ce-9483cbab26ad239c7a102f887177aaf354c9d13c.tar.gz |
Merge branch '26468-fix-admin-recent-sign-in' into 'master'
Using correct column for sorting users by Recent Sign-in
Closes #26468
See merge request gitlab-org/gitlab-ce!13852
Diffstat (limited to 'spec/models/user_spec.rb')
-rw-r--r-- | spec/models/user_spec.rb | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 568aab8530e..011416cc176 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1433,28 +1433,34 @@ describe User do describe '#sort' do before do described_class.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' - @user2 = create :user, created_at: Date.today - 2, last_sign_in_at: nil, name: 'Beta' + @user = create :user, created_at: Date.today, current_sign_in_at: Date.today, name: 'Alpha' + @user1 = create :user, created_at: Date.today - 1, current_sign_in_at: Date.today - 1, name: 'Omega' + @user2 = create :user, created_at: Date.today - 2, name: 'Beta' end context 'when sort by recent_sign_in' do - it 'sorts users by the recent sign-in time' do - expect(described_class.sort('recent_sign_in').first).to eq(@user) + let(:users) { described_class.sort('recent_sign_in') } + + it 'sorts users by recent sign-in time' do + expect(users.first).to eq(@user) + expect(users.second).to eq(@user1) end it 'pushes users who never signed in to the end' do - expect(described_class.sort('recent_sign_in').third).to eq(@user2) + expect(users.third).to eq(@user2) end end context 'when sort by oldest_sign_in' do + let(:users) { described_class.sort('oldest_sign_in') } + it 'sorts users by the oldest sign-in time' do - expect(described_class.sort('oldest_sign_in').first).to eq(@user1) + expect(users.first).to eq(@user1) + expect(users.second).to eq(@user) end it 'pushes users who never signed in to the end' do - expect(described_class.sort('oldest_sign_in').third).to eq(@user2) + expect(users.third).to eq(@user2) end end |