Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Standardize error message of association matcher #1417

Merged
merged 1 commit into from Apr 3, 2021
Merged

Standardize error message of association matcher #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 17 additions & 21 deletions lib/shoulda/matchers/active_record/association_matcher.rb
View file
Open in desktop
Expand Up @@ -1394,23 +1394,25 @@ def touch_correct?
end

def class_has_foreign_key?(klass)
@missing = validate_foreign_key(klass)

@missing.nil?
end

def validate_foreign_key(klass)
if options.key?(:foreign_key) && !foreign_key_correct?
@missing = foreign_key_failure_message(klass, options[:foreign_key])
false
elsif !has_column?(klass, foreign_key)
@missing = foreign_key_failure_message(klass, foreign_key)
false
else
true
foreign_key_failure_message(klass, options[:foreign_key])
elsif !has_column?(klass, actual_foreign_key)
foreign_key_failure_message(klass, actual_foreign_key)
end
end

def has_column?(klass, column)
case column
when Array
column.all? { |c| has_column?(klass, c) }
column.all? { |c| has_column?(klass, c.to_s) }
else
column_names_for(klass).include?(column)
column_names_for(klass).include?(column.to_s)
end
end

Expand Down Expand Up @@ -1442,19 +1444,13 @@ def primary_key_correct?(klass)
end
end

def foreign_key
key = if foreign_key_reflection
if foreign_key_reflection.respond_to?(:foreign_key)
foreign_key_reflection.foreign_key
else
foreign_key_reflection.primary_key_name
end
end

if key.is_a?(Array)
key.map(&:to_s)
def actual_foreign_key
return unless foreign_key_reflection

if foreign_key_reflection.respond_to?(:foreign_key)
foreign_key_reflection.foreign_key
else
key.to_s
foreign_key_reflection.primary_key_name
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb
View file
Open in desktop
Expand Up @@ -1350,7 +1350,7 @@ def having_many_non_existent_class(model_name, assoc_name, options = {})
end

expected_message = 'Expected Person to have a has_one association called detail ' \
'(PersonDetail does not have a ["company_id", "person_detail_id"] foreign key.)'
'(PersonDetail does not have a [:company_id, :person_detail_id] foreign key.)'

expect do
have_one(:detail).class_name('PersonDetail').
Expand Down