aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-03-15 14:17:59 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-03-15 14:17:59 -0300
commita662a7894b5084b569a05adfb9e19003c407900d (patch)
treeeb93848629a567acb6ab8a366232f55d2d01a3bd /activerecord/test
parent9caba4172e91b5be1cd8e056785fbbaa344135a1 (diff)
downloadrails-a662a7894b5084b569a05adfb9e19003c407900d.tar.gz
rails-a662a7894b5084b569a05adfb9e19003c407900d.tar.bz2
rails-a662a7894b5084b569a05adfb9e19003c407900d.zip
Fix implicit join references option reversion in test
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/relations_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index fed1b4a8e8..9008c2785e 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1227,10 +1227,11 @@ class RelationTest < ActiveRecord::TestCase
def test_turn_off_eager_loading_with_conditions_on_joins
original_value = ActiveRecord::Base.disable_implicit_join_references
ActiveRecord::Base.disable_implicit_join_references = true
+
scope = Topic.where(author_email_address: 'my.example@gmail.com').includes(:replies)
assert_not scope.eager_loading?
ensure
- ActiveRecord::Base.time_zone_aware_attributes = original_value
+ ActiveRecord::Base.disable_implicit_join_references = original_value
end
def test_ordering_with_extra_spaces