aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/test_case.rb
diff options
context:
space:
mode:
authorNeeraj Singh <neerajdotname@gmail.com>2013-07-30 13:31:00 +0530
committerNeeraj Singh <neerajdotname@gmail.com>2013-07-30 13:31:00 +0530
commit9c9a5a67bc260358172a1cacb22ec787d59ba39b (patch)
tree8ceadd9e047ac20b09797467f75069ad82cf9800 /activerecord/test/cases/test_case.rb
parentb51786d26e8262534f043c5c614b9e04cd33dbc1 (diff)
downloadrails-9c9a5a67bc260358172a1cacb22ec787d59ba39b.tar.gz
rails-9c9a5a67bc260358172a1cacb22ec787d59ba39b.tar.bz2
rails-9c9a5a67bc260358172a1cacb22ec787d59ba39b.zip
assert_no_queries should allow to ignore some queries
Diffstat (limited to 'activerecord/test/cases/test_case.rb')
-rw-r--r--activerecord/test/cases/test_case.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/test/cases/test_case.rb b/activerecord/test/cases/test_case.rb
index c33e5cdc00..8c6d189b0c 100644
--- a/activerecord/test/cases/test_case.rb
+++ b/activerecord/test/cases/test_case.rb
@@ -45,8 +45,9 @@ module ActiveRecord
x
end
- def assert_no_queries(&block)
- assert_queries(0, :ignore_none => true, &block)
+ def assert_no_queries(options = {}, &block)
+ options.reverse_merge! ignore_none: true
+ assert_queries(0, options, &block)
end
def assert_column(model, column_name, msg=nil)