aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/relation_test.rb
diff options
context:
space:
mode:
authorRichard Schneeman <richard.schneeman+no-recruiters@gmail.com>2018-07-25 16:00:33 -0500
committerGitHub <noreply@github.com>2018-07-25 16:00:33 -0500
commit91fd679710118482f718ea710710561f1cfb0b70 (patch)
tree9169aa6ea2315b16f77e530dd2c6a4eda1816769 /activerecord/test/cases/relation_test.rb
parentab8847c92092a57df6433f4fc72682074359531f (diff)
parentd108288c2f684233298f97f18ac00de0b016deaa (diff)
downloadrails-91fd679710118482f718ea710710561f1cfb0b70.tar.gz
rails-91fd679710118482f718ea710710561f1cfb0b70.tar.bz2
rails-91fd679710118482f718ea710710561f1cfb0b70.zip
Merge pull request #32381 from q-centrix/update-codeclimate-configs
Turn on performance based cops
Diffstat (limited to 'activerecord/test/cases/relation_test.rb')
-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 fbeb617b29..3ca15640fd 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"])
+ relation.merge!(where: ["foo = ?", "bar"]) # rubocop:disable Performance/RedundantMerge
assert_equal Relation::WhereClause.new(["foo = bar"]), relation.where_clause
end