Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/devise/models/authenticatable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ def find_or_initialize_with_error_by(attribute, value, error = :invalid) #:nodoc

# Find or initialize a record with group of attributes based on a list of required attributes.
def find_or_initialize_with_errors(required_attributes, attributes, error = :invalid) #:nodoc:
required_attributes = Array(required_attributes)
attributes.try(:permit!)
attributes = attributes.to_h.with_indifferent_access
.slice(*required_attributes)
Expand Down
10 changes: 10 additions & 0 deletions test/models/authenticatable_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@ class AuthenticatableTest < ActiveSupport::TestCase
assert user_with_error.errors.added?(:email, :invalid)
end

test 'find_or_initialize_with_errors accepts a single symbol as required_attributes' do
user = User.create!(email: "example@example.com", password: "1234567")
assert_equal user, User.find_or_initialize_with_errors(:email, { email: "example@example.com" })
end

test 'find_or_initialize_with_errors adds error when given a single symbol and record is not found' do
user_with_error = User.find_or_initialize_with_errors(:email, { email: "example@example.com" })
assert user_with_error.errors.added?(:email, :invalid)
end

if defined?(ActionController::Parameters)
test 'does not passes an ActionController::Parameters to find_first_by_auth_conditions through find_or_initialize_with_errors' do
user = create_user(email: 'example@example.com')
Expand Down