aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorbogdanvlviv <bogdanvlviv@gmail.com>2018-07-26 11:33:49 +0300
committerbogdanvlviv <bogdanvlviv@gmail.com>2018-07-26 23:37:31 +0300
commit09ec075f1ee52f6bb2be83df1336e6d4924b3e9c (patch)
tree5f5e2e8d14d5b82ebe18d76ac1e53c62f9061517 /activerecord
parentf0c917c7d491f4f7b142748375e1128d5579152a (diff)
downloadrails-09ec075f1ee52f6bb2be83df1336e6d4924b3e9c.tar.gz
rails-09ec075f1ee52f6bb2be83df1336e6d4924b3e9c.tar.bz2
rails-09ec075f1ee52f6bb2be83df1336e6d4924b3e9c.zip
Remove Rubocop's comments from Rails code base
PR#32381 added Rubocop's comments to some tests files in order to exclude `Performance/RedundantMerge`. Turn off `Performance` cops for tests files via `Exclude` in `.rubocop.yml`. Context https://github.com/rails/rails/pull/32381#discussion_r205212331
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/relation_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 3ca15640fd..fbeb617b29 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -187,7 +187,7 @@ module ActiveRecord
end
relation = Relation.new(klass)
- relation.merge!(where: ["foo = ?", "bar"]) # rubocop:disable Performance/RedundantMerge
+ relation.merge!(where: ["foo = ?", "bar"])
assert_equal Relation::WhereClause.new(["foo = bar"]), relation.where_clause
end