diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-31 10:55:00 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-31 10:55:00 -0800 |
| commit | d9c48626f9b1349e7acb496ba32be9bfaf4625da (patch) | |
| tree | c887ccad274ed4c3ac602c7ab6fb06574379445e /activerecord/test | |
| parent | 5cad7a0dba652f3e942e58087bc88ba5c5390edc (diff) | |
| parent | 7be0b7e59cacbb6927477c77bb1420a2ff7dd90d (diff) | |
| download | rails-d9c48626f9b1349e7acb496ba32be9bfaf4625da.tar.gz rails-d9c48626f9b1349e7acb496ba32be9bfaf4625da.tar.bz2 rails-d9c48626f9b1349e7acb496ba32be9bfaf4625da.zip | |
Merge pull request #4742 from petervandenabeele/master
Set the timezone correctly for a test in activerecord/../base_test.rb
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 00a6d97928..6c3e4fc6d0 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -1104,7 +1104,10 @@ class BasicsTest < ActiveRecord::TestCase # TODO: extend defaults tests to other databases! if current_adapter?(:PostgreSQLAdapter) def test_default + tz = Default.default_timezone + Default.default_timezone = :local default = Default.new + Default.default_timezone = tz # fixed dates / times assert_equal Date.new(2004, 1, 1), default.fixed_date |