diff options
| author | Aaron Patterson <tenderlove@github.com> | 2019-01-11 11:21:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 11:21:53 -0800 |
| commit | 74bef0970fff60eaf5faefde30a23f3c36c0b3ee (patch) | |
| tree | 628b6013130e0d2868b2afbac3f00f24629dbb9c /activerecord/test/cases/inheritance_test.rb | |
| parent | 1e923b498492424ae627d7a2c61339148f887503 (diff) | |
| parent | 3a1b2a21965c0cd7bcccff586ce04b029eb4c359 (diff) | |
| download | rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.tar.gz rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.tar.bz2 rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.zip | |
Merge branch 'master' into ac_params_exists
Diffstat (limited to 'activerecord/test/cases/inheritance_test.rb')
| -rw-r--r-- | activerecord/test/cases/inheritance_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb index 3d3189900f..19655a2d38 100644 --- a/activerecord/test/cases/inheritance_test.rb +++ b/activerecord/test/cases/inheritance_test.rb @@ -240,7 +240,7 @@ class InheritanceTest < ActiveRecord::TestCase cabbage = vegetable.becomes!(Cabbage) assert_equal "Cabbage", cabbage.custom_type - vegetable = cabbage.becomes!(Vegetable) + cabbage.becomes!(Vegetable) assert_nil cabbage.custom_type end @@ -654,7 +654,7 @@ class InheritanceAttributeMappingTest < ActiveRecord::TestCase assert_equal ["omg_inheritance_attribute_mapping_test/company"], ActiveRecord::Base.connection.select_values("SELECT sponsorable_type FROM sponsors") - sponsor = Sponsor.first + sponsor = Sponsor.find(sponsor.id) assert_equal startup, sponsor.sponsorable end end |