must now set the devise default scope (since we now have an :email scope)

and rubocop fixes
This commit is contained in:
Brett Walker 2017-09-24 19:52:49 +02:00
parent d7d335c05b
commit d97b577a1b
6 changed files with 8 additions and 8 deletions

View file

@ -21,7 +21,7 @@ class Email < ActiveRecord::Base
def unique_email
self.errors.add(:email, 'has already been taken') if User.exists?(email: self.email)
end
# once email is confirmed, update the gpg signatures
def update_invalid_gpg_signatures
user.update_invalid_gpg_signatures if confirmed?

View file

@ -223,7 +223,7 @@ class User < ActiveRecord::Base
end
end
# see if the new email is already a verified secondary email
# see if the new email is already a verified secondary email
def check_for_verified_email
skip_reconfirmation! if emails.find_by(email: self.email).try(:confirmed?)
end

View file

@ -175,7 +175,7 @@ Devise.setup do |config|
# Configure the default scope given to Warden. By default it's the first
# devise role declared in your routes (usually :user).
# config.default_scope = :user
config.default_scope = :user # now have an :email scope as well, so set the default
# Configure sign_out behavior.
# Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope).

View file

@ -17,7 +17,7 @@ describe ProfilesController do
it "allows an email update without confirmation if existing verified email" do
user = create(:user)
email = create(:email, :confirmed, user: user, email: 'john@gmail.com')
create(:email, :confirmed, user: user, email: 'john@gmail.com')
sign_in(user)
put :update,

View file

@ -26,7 +26,7 @@ describe Email do
email.confirm
end
end
describe 'scopes' do
let(:user) { create(:user) }

View file

@ -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