From 6ce924fa9f8ab2d96d8d78461d9a88aa0e99ec7b Mon Sep 17 00:00:00 2001 From: lest Date: Wed, 30 Nov 2011 18:47:49 +0300 Subject: fix method redefined warning in activemodel --- activemodel/test/cases/serializable/json_test.rb | 4 +++- activemodel/test/cases/serializable/xml_test.rb | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'activemodel/test') diff --git a/activemodel/test/cases/serializable/json_test.rb b/activemodel/test/cases/serializable/json_test.rb index ad5b04091e..e5364d9858 100644 --- a/activemodel/test/cases/serializable/json_test.rb +++ b/activemodel/test/cases/serializable/json_test.rb @@ -14,9 +14,11 @@ class Contact end end + remove_method :attributes if method_defined?(:attributes) + def attributes instance_values - end unless method_defined?(:attributes) + end end class JsonSerializationTest < ActiveModel::TestCase diff --git a/activemodel/test/cases/serializable/xml_test.rb b/activemodel/test/cases/serializable/xml_test.rb index 817ca1e736..834c4de1e1 100644 --- a/activemodel/test/cases/serializable/xml_test.rb +++ b/activemodel/test/cases/serializable/xml_test.rb @@ -9,6 +9,8 @@ class Contact attr_accessor :address, :friends + remove_method :attributes if method_defined?(:attributes) + def attributes instance_values.except("address", "friends") end -- cgit v1.2.3