aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorst0012 <stan001212@gmail.com>2019-07-28 14:43:23 +0800
committerst0012 <stan001212@gmail.com>2019-07-28 14:47:57 +0800
commit6fbf52d580b661d79dd001774b254b4d258ab8bf (patch)
tree9a71ebadc525cfb4feab383eb56893291664016e
parentd1ffe59ab5fd6e811833c127d43b32e87b5d7131 (diff)
downloadrails-6fbf52d580b661d79dd001774b254b4d258ab8bf.tar.gz
rails-6fbf52d580b661d79dd001774b254b4d258ab8bf.tar.bz2
rails-6fbf52d580b661d79dd001774b254b4d258ab8bf.zip
Use capture_sql helper method in tests
-rw-r--r--activerecord/test/cases/associations/belongs_to_associations_test.rb5
-rw-r--r--activerecord/test/cases/associations/has_one_associations_test.rb5
2 files changed, 2 insertions, 8 deletions
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index 21286be320..6bd305306f 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -60,10 +60,7 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
end
def test_belongs_to_does_not_use_order_by
- ActiveRecord::SQLCounter.clear_log
- Client.find(3).firm
- ensure
- sql_log = ActiveRecord::SQLCounter.log
+ sql_log = capture_sql { Client.find(3).firm }
assert sql_log.all? { |sql| !/order by/i.match?(sql) }, "ORDER BY was used in the query: #{sql_log}"
end
diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb
index 9227f10c0e..46498a6dfb 100644
--- a/activerecord/test/cases/associations/has_one_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -37,10 +37,7 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
end
def test_has_one_does_not_use_order_by
- ActiveRecord::SQLCounter.clear_log
- companies(:first_firm).account
- ensure
- sql_log = ActiveRecord::SQLCounter.log
+ sql_log = capture_sql { companies(:first_firm).account }
assert sql_log.all? { |sql| !/order by/i.match?(sql) }, "ORDER BY was used in the query: #{sql_log}"
end