diff options
author | Brett Walker <brett@digitalmoksha.com> | 2017-09-14 16:18:32 +0200 |
---|---|---|
committer | Brett Walker <brett@digitalmoksha.com> | 2017-09-23 15:26:04 +0200 |
commit | a32f1dddf2ed65f3e61ded56256da2996d6442bd (patch) | |
tree | ff1b82df8738ed7c3ffa21086537bd7c44199ef8 /spec/models/user_spec.rb | |
parent | a000c2a1443beb7de0b5193f89916ccce57170c5 (diff) | |
download | gitlab-ce-a32f1dddf2ed65f3e61ded56256da2996d6442bd.tar.gz |
fixes for rubocop
Diffstat (limited to 'spec/models/user_spec.rb')
-rw-r--r-- | spec/models/user_spec.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 45f0144f68e..a230f72449a 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -409,14 +409,12 @@ describe User do end it 'transfers old confirmation values into new secondary' do - org_user = @user @user.update_attributes!(email: @secondary.email) @user.reload expect(@user.emails.count).to eq 1 expect(@user.emails.first.confirmed_at).not_to eq nil end end - end describe '#update_tracked_fields!', :clean_gitlab_redis_shared_state do @@ -1146,8 +1144,8 @@ describe User do let(:user) { create(:user) } it 'returns only confirmed emails' do - email_confirmed = create :email, user: user, confirmed_at: Time.now - email_unconfirmed = create :email, user: user + email_confirmed = create :email, user: user, confirmed_at: Time.now + create :email, user: user user.reload expect(user.verified_emails).to match_array([user.email, email_confirmed.email]) end @@ -1157,8 +1155,8 @@ describe User do let(:user) { create(:user) } it 'returns true when the email is verified/confirmed' do - email_confirmed = create :email, user: user, confirmed_at: Time.now - email_unconfirmed = create :email, user: user + email_confirmed = create :email, user: user, confirmed_at: Time.now + create :email, user: user user.reload expect(user.verified_email?(user.email)).to be_truthy |