From b23365fe5cedd4b88a2576423540ec94929b527e Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Thu, 28 Aug 2014 16:56:53 +0900 Subject: Move model definition to test/models for test order indenendency --- activemodel/test/models/contact.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'activemodel/test/models') diff --git a/activemodel/test/models/contact.rb b/activemodel/test/models/contact.rb index c25be28e1d..bcfd267a34 100644 --- a/activemodel/test/models/contact.rb +++ b/activemodel/test/models/contact.rb @@ -1,8 +1,13 @@ class Contact extend ActiveModel::Naming include ActiveModel::Conversion + include ActiveModel::Validations + + include ActiveModel::Serializers::JSON + include ActiveModel::Serializers::Xml attr_accessor :id, :name, :age, :created_at, :awesome, :preferences + attr_accessor :address, :friends, :contact def social %w(twitter github) @@ -23,4 +28,14 @@ class Contact def persisted? id end + + def attributes=(hash) + hash.each do |k, v| + instance_variable_set("@#{k}", v) + end + end + + def attributes + instance_values.except("address", "friends", "contact") + end end -- cgit v1.2.3