diff options
author | Angelo capilleri <capilleri@yahoo.com> | 2012-06-08 19:39:17 +0200 |
---|---|---|
committer | Angelo capilleri <capilleri@yahoo.com> | 2012-06-12 18:04:44 +0200 |
commit | b97e0a1127d45e25e4281d6c1b5fb9a57f0efea6 (patch) | |
tree | 4550c65275a9423b484b17af55a75e43bf1b1916 | |
parent | fa352c46da1b89534f2ddb04a602b7d09c0f5872 (diff) | |
download | rails-b97e0a1127d45e25e4281d6c1b5fb9a57f0efea6.tar.gz rails-b97e0a1127d45e25e4281d6c1b5fb9a57f0efea6.tar.bz2 rails-b97e0a1127d45e25e4281d6c1b5fb9a57f0efea6.zip |
Fix the the backport of the object dup with the ruby 1.9.3p194.
At the end of initialize_dup was added the call to super if it exists,
so it also works with 1.8.7 where initialize_dup doesn't exist.
This issu was introduced with the pull request #6324
-rw-r--r-- | activemodel/lib/active_model/validations.rb | 3 | ||||
-rw-r--r-- | activemodel/test/cases/validations_test.rb | 11 | ||||
-rw-r--r-- | activemodel/test/models/book.rb | 3 |
3 files changed, 16 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb index 18cd53e130..f38121c175 100644 --- a/activemodel/lib/active_model/validations.rb +++ b/activemodel/lib/active_model/validations.rb @@ -168,8 +168,9 @@ module ActiveModel # Clean the +Errors+ object if instance is duped def initialize_dup(other) # :nodoc: @errors = nil + super if defined?(super) end - + # Backport dup from 1.9 so that #initialize_dup gets called unless Object.respond_to?(:initialize_dup) def dup # :nodoc: diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb index 56c9a5592c..d000a88ce1 100644 --- a/activemodel/test/cases/validations_test.rb +++ b/activemodel/test/cases/validations_test.rb @@ -5,6 +5,7 @@ require 'models/topic' require 'models/reply' require 'models/custom_reader' require 'models/automobile' +require 'models/book' require 'active_support/json' require 'active_support/xml_mini' @@ -354,4 +355,14 @@ class ValidationsTest < ActiveModel::TestCase assert topic.invalid? assert duped.valid? end + + def test_dup_call_parent_dup_when_include_validations + book = Book.new + book['title'] = "Litterature" + book['author'] = "Foo" + duped = book.dup + + assert_equal book.keys, duped.keys + assert_equal book.values, duped.values + end end diff --git a/activemodel/test/models/book.rb b/activemodel/test/models/book.rb new file mode 100644 index 0000000000..c5c19046c8 --- /dev/null +++ b/activemodel/test/models/book.rb @@ -0,0 +1,3 @@ +class Book < Hash + include ActiveModel::Validations +end |