aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-28 07:44:56 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-28 07:44:56 -0700
commitc8461e0d43c972b75ab900a1ab8addcad892dde6 (patch)
treea7d390238f5eb6322e668a498dbf5dd7052a5653 /activerecord/test/cases
parentf625d325e01051c1f8fd7b70190ac698620507cf (diff)
parent5e68e42f6209a8f80cbfb223f8d487e447eda084 (diff)
downloadrails-c8461e0d43c972b75ab900a1ab8addcad892dde6.tar.gz
rails-c8461e0d43c972b75ab900a1ab8addcad892dde6.tar.bz2
rails-c8461e0d43c972b75ab900a1ab8addcad892dde6.zip
Merge pull request #11637 from neerajdotname/make_test_not_depend_on_order
reset default timezone and make test order independent
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/multiparameter_attributes_test.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/test/cases/multiparameter_attributes_test.rb b/activerecord/test/cases/multiparameter_attributes_test.rb
index 1209f5460f..ce21760645 100644
--- a/activerecord/test/cases/multiparameter_attributes_test.rb
+++ b/activerecord/test/cases/multiparameter_attributes_test.rb
@@ -11,6 +11,10 @@ class MultiParameterAttributeTest < ActiveRecord::TestCase
Time.zone = nil
end
+ def teardown
+ ActiveRecord::Base.default_timezone = :utc
+ end
+
def test_multiparameter_attributes_on_date
attributes = { "last_read(1i)" => "2004", "last_read(2i)" => "6", "last_read(3i)" => "24" }
topic = Topic.find(1)