aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/aggregations_test.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-08-27 05:36:04 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-08-27 05:36:04 -0700
commit930dbbbcff71dfb1818549ea936aabe91cc357a6 (patch)
treeeea620a54de98e9a78ea1e73b726d7003dea954c /activerecord/test/cases/aggregations_test.rb
parentea84b0c6183949750f0801db50d22e58d62ec024 (diff)
parent47cce917f266baa0c51bb259b8ad678c0422830d (diff)
downloadrails-930dbbbcff71dfb1818549ea936aabe91cc357a6.tar.gz
rails-930dbbbcff71dfb1818549ea936aabe91cc357a6.tar.bz2
rails-930dbbbcff71dfb1818549ea936aabe91cc357a6.zip
Merge pull request #7451 from frodsan/fix_dep_ag
fix order dependent test in AggregationsTest
Diffstat (limited to 'activerecord/test/cases/aggregations_test.rb')
-rw-r--r--activerecord/test/cases/aggregations_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/cases/aggregations_test.rb b/activerecord/test/cases/aggregations_test.rb
index 5bd8f76ba2..48b06a767f 100644
--- a/activerecord/test/cases/aggregations_test.rb
+++ b/activerecord/test/cases/aggregations_test.rb
@@ -114,6 +114,8 @@ class AggregationsTest < ActiveRecord::TestCase
customers(:david).save
customers(:david).reload
assert_nil customers(:david).non_blank_gps_location
+ ensure
+ Customer.gps_conversion_was_run = nil
end
def test_nil_return_from_converter_results_in_failure_when_allow_nil_is_false