diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-07-20 12:48:18 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 12:48:18 -0300 |
| commit | 5757b9dbe732be03d41d4c23a6545bc396545421 (patch) | |
| tree | 6003bf375d7a359db786a694d06f0fdde0de719a /activerecord/test | |
| parent | a8a3a8cc691facad4ba7487a7b66362b498720c9 (diff) | |
| parent | cc4abed844e74bb3d91267a7d01e7d902dc79779 (diff) | |
| download | rails-5757b9dbe732be03d41d4c23a6545bc396545421.tar.gz rails-5757b9dbe732be03d41d4c23a6545bc396545421.tar.bz2 rails-5757b9dbe732be03d41d4c23a6545bc396545421.zip | |
Merge pull request #25897 from yahonda/remove_set_date_columns_and_modify_attributes_test
Remove Oracle specific tests based on deprecated behaviors
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/migration/column_attributes_test.rb | 9 | ||||
| -rw-r--r-- | activerecord/test/models/topic.rb | 6 |
2 files changed, 1 insertions, 14 deletions
diff --git a/activerecord/test/cases/migration/column_attributes_test.rb b/activerecord/test/cases/migration/column_attributes_test.rb index 29546525f3..2f71ba870d 100644 --- a/activerecord/test/cases/migration/column_attributes_test.rb +++ b/activerecord/test/cases/migration/column_attributes_test.rb @@ -156,14 +156,7 @@ module ActiveRecord assert_equal String, bob.bio.class assert_kind_of Integer, bob.age assert_equal Time, bob.birthday.class - - if current_adapter?(:OracleAdapter) - # Oracle doesn't differentiate between date/time - assert_equal Time, bob.favorite_day.class - else - assert_equal Date, bob.favorite_day.class - end - + assert_equal Date, bob.favorite_day.class assert_instance_of TrueClass, bob.male? assert_kind_of BigDecimal, bob.wealth end diff --git a/activerecord/test/models/topic.rb b/activerecord/test/models/topic.rb index 176bc79dc7..21c23ed2a2 100644 --- a/activerecord/test/models/topic.rb +++ b/activerecord/test/models/topic.rb @@ -43,12 +43,6 @@ class Topic < ActiveRecord::Base before_create :default_written_on before_destroy :destroy_children - # Explicitly define as :date column so that returned Oracle DATE values would be typecasted to Date and not Time. - # Some tests depend on assumption that this attribute will have Date values. - if current_adapter?(:OracleEnhancedAdapter) - set_date_columns :last_read - end - def parent Topic.find(parent_id) end |