aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/relations_test.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-07-05 16:44:32 +0200
committerYves Senn <yves.senn@gmail.com>2013-07-05 16:44:32 +0200
commitb54ef7ebdeeb0463e3348001d3d16b39a7e09506 (patch)
tree96b8ba03b4d3026453528fb85927c05aa19f6635 /activerecord/test/cases/relations_test.rb
parent5ade0ddfe0cb963e7d41a6b5d50e28ee9df3bc00 (diff)
downloadrails-b54ef7ebdeeb0463e3348001d3d16b39a7e09506.tar.gz
rails-b54ef7ebdeeb0463e3348001d3d16b39a7e09506.tar.bz2
rails-b54ef7ebdeeb0463e3348001d3d16b39a7e09506.zip
Revert "Merge pull request #11299 from arunagw/disable_implicit_join_references_removed"
`disable_implicit_join_references=` was only deprecated on `master`, not with rails 4.0. We can remove it after 4.1 This reverts commit 3c719ead414ffd29e71efce185698af979052abb, reversing changes made to d5c3bf9722abd5733a769c8d789de3f74dbfb92d.
Diffstat (limited to 'activerecord/test/cases/relations_test.rb')
-rw-r--r--activerecord/test/cases/relations_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index ac769ea90a..b205472cf5 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1216,6 +1216,12 @@ class RelationTest < ActiveRecord::TestCase
assert_equal "id", Post.all.primary_key
end
+ def test_disable_implicit_join_references_is_deprecated
+ assert_deprecated do
+ ActiveRecord::Base.disable_implicit_join_references = true
+ end
+ end
+
def test_ordering_with_extra_spaces
assert_equal authors(:david), Author.order('id DESC , name DESC').last
end