Skip to content

Fix "undefined method `<'" error message #774

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

Merged
merged 2 commits into from
Apr 5, 2020
Merged

Fix "undefined method `<'" error message #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56338b5
Add a broken test
erikkessler1 Mar 9, 2020
86fd838
Ensure klass is a Class
erikkessler1 Mar 9, 2020
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
2 changes: 1 addition & 1 deletion lib/annotate/annotate_models.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ def annotate_model_file(annotated, file, header, options)
begin
return false if /#{SKIP_ANNOTATION_PREFIX}.*/ =~ (File.exist?(file) ? File.read(file) : '')
klass = get_model_class(file)
do_annotate = klass &&
do_annotate = klass.is_a?(Class) &&
klass < ActiveRecord::Base &&
(!options[:exclude_sti_subclasses] || !(klass.superclass < ActiveRecord::Base && klass.table_name == klass.superclass.table_name)) &&
!klass.abstract_class? &&
Expand Down
13 changes: 13 additions & 0 deletions spec/lib/annotate/annotate_models_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2743,5 +2743,18 @@ class Foo < ActiveRecord::Base; end
it 'skips attempt to annotate if no table exists for model' do
is_expected.to eq nil
end

context 'with a non-class' do
before do
NotAClass = 'foo'.freeze # rubocop:disable Naming/ConstantName
allow(AnnotateModels).to receive(:get_model_class).with('foo.rb') { NotAClass }
end

after { Object.send :remove_const, 'NotAClass' }

it "doesn't output an error" do
expect { subject }.not_to output.to_stderr
end
end
end
end