diff options
author | Brett Walker <brett@digitalmoksha.com> | 2017-09-24 19:52:49 +0200 |
---|---|---|
committer | Brett Walker <brett@digitalmoksha.com> | 2017-09-24 19:52:49 +0200 |
commit | d97b577a1bee80bd79209d2e6d501d1cd93debcc (patch) | |
tree | 660edfe661e2e8c3e14aa3a1986dfecc70eb7d46 /spec/models/user_spec.rb | |
parent | d7d335c05b9ae359b72f59c31bbe5ed059df7f52 (diff) | |
download | gitlab-ce-d97b577a1bee80bd79209d2e6d501d1cd93debcc.tar.gz |
must now set the devise default scope (since we now have an :email scope)
and rubocop fixes
Diffstat (limited to 'spec/models/user_spec.rb')
-rw-r--r-- | spec/models/user_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 839b1f5da79..9ed155b0fa0 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -359,11 +359,11 @@ describe User do expect(external_user.projects_limit).to be 0 end end - + describe '#check_for_verified_email' do let(:user) { create(:user) } - let(:secondary) { create(:email, :confirmed, email: 'secondary@example.com', user: user, ) } - + let(:secondary) { create(:email, :confirmed, email: 'secondary@example.com', user: user) } + it 'allows a verfied secondary email to be used as the primary without needing reconfirmation' do user.update_attributes!(email: secondary.email) user.reload |