diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-12-29 20:09:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-29 20:09:43 +0100 |
| commit | ca3eb2c1569a86e9c7eee2e9877dd773797a76b4 (patch) | |
| tree | 016b5f2247d6ad4d95f1b1f05c897b5472abb7bf /activerecord/test/cases/reflection_test.rb | |
| parent | 654704247eba742e139cfaa8d1385f13605d9e12 (diff) | |
| parent | c491bf012948383632e53f874c552041a6e23b36 (diff) | |
| download | rails-ca3eb2c1569a86e9c7eee2e9877dd773797a76b4.tar.gz rails-ca3eb2c1569a86e9c7eee2e9877dd773797a76b4.tar.bz2 rails-ca3eb2c1569a86e9c7eee2e9877dd773797a76b4.zip | |
Merge branch 'master' into fix_26964
Diffstat (limited to 'activerecord/test/cases/reflection_test.rb')
| -rw-r--r-- | activerecord/test/cases/reflection_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb index 5dac3d064b..a90058e8bb 100644 --- a/activerecord/test/cases/reflection_test.rb +++ b/activerecord/test/cases/reflection_test.rb @@ -86,8 +86,8 @@ class ReflectionTest < ActiveRecord::TestCase column = @first.column_for_attribute("attribute_that_doesnt_exist") assert_instance_of ActiveRecord::ConnectionAdapters::NullColumn, column assert_equal "attribute_that_doesnt_exist", column.name - assert_equal nil, column.sql_type - assert_equal nil, column.type + assert_nil column.sql_type + assert_nil column.type end def test_non_existent_types_are_identity_types |