From 1171324f8e28dcb23db8fcf84479900a56bf6c9d Mon Sep 17 00:00:00 2001 From: Subba Rao Pasupuleti Date: Sat, 7 Aug 2010 08:21:59 -0400 Subject: [PATCH 1/2] Addin missing required statements [#5317 state:resolved] --- .../serializeration/json_serialization_test.rb | 1 + activerecord/test/cases/persistence_test.rb | 1 + 2 files changed, 2 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 diff --git a/activerecord/test/cases/persistence_test.rb b/activerecord/test/cases/persistence_test.rb index d7666b1..fc590e4 100644 --- a/activerecord/test/cases/persistence_test.rb +++ b/activerecord/test/cases/persistence_test.rb @@ -2,6 +2,7 @@ require "cases/helper" require 'models/post' require 'models/author' require 'models/topic' +require 'models/comment' require 'models/reply' require 'models/category' require 'models/company' -- 1.7.0.4 From fa5c40b1e0449968f3c33281d2f4b1cc68afc88c Mon Sep 17 00:00:00 2001 From: rohit Date: Sat, 7 Aug 2010 18:40:57 +0530 Subject: [PATCH 2/2] Remove trailing whitespace. [#5317 state:resolved] --- .../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