diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-21 04:22:59 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-21 04:22:59 -0800 |
| commit | a50382cacdfa2e30c882f9f462e982d78e3e8ef5 (patch) | |
| tree | 2cbe67d968fdd9a28330451b78b8b61a7484cac6 /activerecord/test/cases | |
| parent | c05f3b0e4f6c5b2b350828e5e3cf9d0b1146562f (diff) | |
| parent | bd603399639fe7dd12e532a89210760fa564440c (diff) | |
| download | rails-a50382cacdfa2e30c882f9f462e982d78e3e8ef5.tar.gz rails-a50382cacdfa2e30c882f9f462e982d78e3e8ef5.tar.bz2 rails-a50382cacdfa2e30c882f9f462e982d78e3e8ef5.zip | |
Merge pull request #4573 from amatsuda/ar_default_timezone_utc
change AR default_timezone to :utc since it's the default for AR::Railtie
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 3ab6973549..87a3a0deb9 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -689,7 +689,7 @@ class BasicsTest < ActiveRecord::TestCase } topic = Topic.find(1) topic.attributes = attributes - assert_equal Time.local(2004, 6, 24, 16, 24, 0), topic.written_on + assert_equal Time.utc(2004, 6, 24, 16, 24, 0), topic.written_on end def test_multiparameter_attributes_on_time_with_no_date @@ -938,7 +938,7 @@ class BasicsTest < ActiveRecord::TestCase } topic = Topic.find(1) topic.attributes = attributes - assert_equal Time.local(2000, 1, 1, 5, 42, 0), topic.bonus_time + assert_equal Time.utc(2000, 1, 1, 5, 42, 0), topic.bonus_time end def test_boolean |