diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index c6f2102a5f..b51bb5cc5e 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -697,9 +697,9 @@ module ActiveRecord #:nodoc: include Scoping extend DynamicMatchers include Sanitization - include Integration include AttributeAssignment include ActiveModel::Conversion + include Integration include Validations extend CounterCache include Locking::Optimistic, Locking::Pessimistic diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 91a70e0239..db42f17eeb 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -1911,6 +1911,12 @@ class BasicsTest < ActiveRecord::TestCase assert_kind_of String, Client.find(:first).to_param end + def test_to_param_returns_id_even_if_not_persisted + client = Client.new + client.id = 1 + assert_equal "1", client.to_param + end + def test_inspect_class assert_equal 'ActiveRecord::Base', ActiveRecord::Base.inspect assert_equal 'LoosePerson(abstract)', LoosePerson.inspect |