aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/relation
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-08-16 23:10:53 -0300
committerGitHub <noreply@github.com>2016-08-16 23:10:53 -0300
commitaf4dfa9e1ad85986f65f759f8222fc3bbbf1f4ef (patch)
treea3ad0f772480bbce60d9db9bddd4493b6483b7e4 /activerecord/test/cases/relation
parent12a42f79adb972948c7509a0be2971ca2c37e7c3 (diff)
parentc6a62dc327c54baec87306f5c381e13cacc00a19 (diff)
downloadrails-af4dfa9e1ad85986f65f759f8222fc3bbbf1f4ef.tar.gz
rails-af4dfa9e1ad85986f65f759f8222fc3bbbf1f4ef.tar.bz2
rails-af4dfa9e1ad85986f65f759f8222fc3bbbf1f4ef.zip
Merge pull request #25671 from kamipo/dont_handle_as_associated_predicate_if_table_has_column
Do not handle as an associated predicate if a table has the column
Diffstat (limited to 'activerecord/test/cases/relation')
-rw-r--r--activerecord/test/cases/relation/where_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/relation/where_test.rb b/activerecord/test/cases/relation/where_test.rb
index ad9008ea4d..ce4e041793 100644
--- a/activerecord/test/cases/relation/where_test.rb
+++ b/activerecord/test/cases/relation/where_test.rb
@@ -196,7 +196,7 @@ module ActiveRecord
end
def test_where_error
- assert_raises(ActiveRecord::StatementInvalid) do
+ assert_nothing_raised do
Post.where(id: { "posts.author_id" => 10 }).first
end
end