aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-28 07:45:12 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-28 07:45:12 -0700
commit4a76054165c2dc637c04f6af4491c1bad337ca6d (patch)
treeae91239c77260919ed45a81ff488a9095dafa018 /activerecord
parentc8461e0d43c972b75ab900a1ab8addcad892dde6 (diff)
parentd52052d02780a2b271393549431afbca2aa868d1 (diff)
downloadrails-4a76054165c2dc637c04f6af4491c1bad337ca6d.tar.gz
rails-4a76054165c2dc637c04f6af4491c1bad337ca6d.tar.bz2
rails-4a76054165c2dc637c04f6af4491c1bad337ca6d.zip
Merge pull request #11635 from neerajdotname/make_test_order_independent_by_resetting_timezone
make test order independent by resetting timezone
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/integration_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/cases/integration_test.rb b/activerecord/test/cases/integration_test.rb
index b0a7cda2f3..f5daca2fa8 100644
--- a/activerecord/test/cases/integration_test.rb
+++ b/activerecord/test/cases/integration_test.rb
@@ -32,6 +32,8 @@ class IntegrationTest < ActiveRecord::TestCase
est_key = Developer.first.cache_key
assert_equal utc_key, est_key
+ ensure
+ Time.zone = 'UTC'
end
def test_cache_key_format_for_existing_record_with_updated_at