Skip to content

Commit 585ddf1

Browse files
authored
Merge pull request #995 from masato-bkn/improve_rails_find_each
Check for `or` method in `Rails/FindEach` cop
2 parents 8611336 + bf38577 commit 585ddf1

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* [#995](https://github.com/rubocop/rubocop-rails/pull/995): Check for `or` method in `Rails/FindEach` cop. ([@masato-bkn][])

lib/rubocop/cop/rails/find_each.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class FindEach < Base
3434
RESTRICT_ON_SEND = %i[each].freeze
3535

3636
SCOPE_METHODS = %i[
37-
all eager_load includes joins left_joins left_outer_joins not preload
37+
all eager_load includes joins left_joins left_outer_joins not or preload
3838
references unscoped where
3939
].freeze
4040

spec/rubocop/cop/rails/find_each_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
it_behaves_like('register_offense', 'joins(:association_name)')
2929
it_behaves_like('register_offense', 'left_joins(:association_name)')
3030
it_behaves_like('register_offense', 'left_outer_joins(:association_name)')
31+
it_behaves_like('register_offense', 'where(name: name).or(User.where(age: age))')
3132
it_behaves_like('register_offense', 'preload(:association_name)')
3233
it_behaves_like('register_offense', 'references(:association_name)')
3334
it_behaves_like('register_offense', 'unscoped')

0 commit comments

Comments
 (0)