diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/migration_test.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 0ee92e8ba9..d852a6d3d0 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* test_native_types expects DateTime.local_offset instead of DateTime.now.offset; fixes test breakage due to dst transition [Geoff Buesing] + * Add :readonly option to HasManyThrough associations. #11156 [miloops] * Improve performance on :include/:conditions/:limit queries by selectively joining in the pre-query. #9560 [dasil003] diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index 32d7dbe3c4..5dbfbd81c2 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -330,7 +330,7 @@ if ActiveRecord::Base.connection.supports_migrations? # Test DateTime column and defaults, including timezone. # FIXME: moment of truth may be Time on 64-bit platforms. if bob.moment_of_truth.is_a?(DateTime) - assert_equal DateTime.now.offset, bob.moment_of_truth.offset + assert_equal DateTime.local_offset, bob.moment_of_truth.offset assert_not_equal 0, bob.moment_of_truth.offset assert_not_equal "Z", bob.moment_of_truth.zone assert_equal DateTime::ITALY, bob.moment_of_truth.start |