diff options
| author | Gannon McGibbon <gannon.mcgibbon@gmail.com> | 2019-02-19 13:59:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-19 13:59:32 -0500 |
| commit | 16a8072e2db29d5ec895830dca995f99ce1915d6 (patch) | |
| tree | 4470741e751b9a8ddcaf478783416ef52a742698 /activerecord/test | |
| parent | 64ef5e2f9e854a7f988227d629a699f11a998b17 (diff) | |
| parent | 08e78ad4ae1507a9ed70f3784370febd84a49592 (diff) | |
| download | rails-16a8072e2db29d5ec895830dca995f99ce1915d6.tar.gz rails-16a8072e2db29d5ec895830dca995f99ce1915d6.tar.bz2 rails-16a8072e2db29d5ec895830dca995f99ce1915d6.zip | |
Merge pull request #35271 from gmcgibbon/fix_time_attribute_test_failures
Reset column info after making Topic tz-aware
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/attribute_methods_test.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb index d341dd0083..148c9dd347 100644 --- a/activerecord/test/cases/attribute_methods_test.rb +++ b/activerecord/test/cases/attribute_methods_test.rb @@ -711,6 +711,10 @@ class AttributeMethodsTest < ActiveRecord::TestCase record.written_on = "Jan 01 00:00:00 2014" assert_equal record, YAML.load(YAML.dump(record)) end + ensure + # NOTE: Reset column info because global topics + # don't have tz-aware attributes by default. + Topic.reset_column_information end test "setting a time zone-aware time in the current time zone" do |