From 20d67d57a484ead279c84f068ee86a5093188a26 Mon Sep 17 00:00:00 2001 From: Subba Rao Pasupuleti Date: Fri, 6 Aug 2010 09:04:13 -0400 Subject: [PATCH 1/2] Add model require --- .../serializeration/json_serialization_test.rb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/activemodel/test/cases/serializeration/json_serialization_test.rb b/activemodel/test/cases/serializeration/json_serialization_test.rb index 1ac991a..381124c 100644 --- a/activemodel/test/cases/serializeration/json_serialization_test.rb +++ b/activemodel/test/cases/serializeration/json_serialization_test.rb @@ -1,5 +1,6 @@ require 'cases/helper' require 'models/contact' +require 'models/automobile' require 'active_support/core_ext/object/instance_variables' class Contact -- 1.7.0.4 From 33eeb523493bb6544a5c2de8ed21f0d35b772a40 Mon Sep 17 00:00:00 2001 From: rohit Date: Sat, 7 Aug 2010 09:25:40 +0530 Subject: [PATCH 2/2] Remove trailing whitespace. [#5317 state:committed] --- .../serializeration/json_serialization_test.rb | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/activemodel/test/cases/serializeration/json_serialization_test.rb b/activemodel/test/cases/serializeration/json_serialization_test.rb index 381124c..6881d44 100644 --- a/activemodel/test/cases/serializeration/json_serialization_test.rb +++ b/activemodel/test/cases/serializeration/json_serialization_test.rb @@ -106,15 +106,13 @@ class JsonSerializationTest < ActiveModel::TestCase test "should return OrderedHash for errors" do car = Automobile.new - + # run the validation - car.valid? - + car.valid? + hash = ActiveSupport::OrderedHash.new hash[:make] = "can't be blank" hash[:model] = "is too short (minimum is 2 characters)" assert_equal hash.to_json, car.errors.to_json end - - end -- 1.7.0.4