aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/eager_test.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-02-23 13:59:49 -0300
committerRafael França <rafaelmfranca@gmail.com>2016-02-23 13:59:49 -0300
commit3adc35aefa7e5f58fe0e7d6678daeaa5e47dd7df (patch)
tree79520ac71677f154f91bbe29d11199ba5ab8de0f /activerecord/test/cases/associations/eager_test.rb
parent79887593c18919fed49f441d64236362cb755872 (diff)
parentd96550b53ecf3816dff3cb0d68dc976028dc9351 (diff)
downloadrails-3adc35aefa7e5f58fe0e7d6678daeaa5e47dd7df.tar.gz
rails-3adc35aefa7e5f58fe0e7d6678daeaa5e47dd7df.tar.bz2
rails-3adc35aefa7e5f58fe0e7d6678daeaa5e47dd7df.zip
Merge pull request #23789 from wisetara/wisetara/deprecate-args-ActiveSupport__TestCase#assert_nothing_raised-for-pr
Wisetara/deprecate args active support test case#assert nothing raised for pr
Diffstat (limited to 'activerecord/test/cases/associations/eager_test.rb')
-rw-r--r--activerecord/test/cases/associations/eager_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 874d53c51f..ac478cbb01 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -1216,7 +1216,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
end
def test_join_eager_with_empty_order_should_generate_valid_sql
- assert_nothing_raised(ActiveRecord::StatementInvalid) do
+ assert_nothing_raised do
Post.includes(:comments).order("").where(:comments => {:body => "Thank you for the welcome"}).first
end
end