From c6e0923245a2e50cd7e1db11741a66569bfd6812 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 5 Sep 2009 18:54:19 -0500
Subject: Fix failing AMo isolated tests

---
 activemodel/test/cases/serializeration/json_serialization_test.rb | 2 ++
 activemodel/test/cases/serializeration/xml_serialization_test.rb  | 2 ++
 activemodel/test/cases/validations/presence_validation_test.rb    | 1 +
 activemodel/test/cases/validations/with_validation_test.rb        | 2 ++
 4 files changed, 7 insertions(+)

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/serializeration/json_serialization_test.rb b/activemodel/test/cases/serializeration/json_serialization_test.rb
index 6227aedc39..d4c7c31633 100644
--- a/activemodel/test/cases/serializeration/json_serialization_test.rb
+++ b/activemodel/test/cases/serializeration/json_serialization_test.rb
@@ -1,7 +1,9 @@
 require 'cases/helper'
 require 'models/contact'
+require 'active_support/core_ext/object/instance_variables'
 
 class Contact
+  extend ActiveModel::Naming
   include ActiveModel::Serializers::JSON
 
   def attributes
diff --git a/activemodel/test/cases/serializeration/xml_serialization_test.rb b/activemodel/test/cases/serializeration/xml_serialization_test.rb
index 428e5a6bd1..7212719c2d 100644
--- a/activemodel/test/cases/serializeration/xml_serialization_test.rb
+++ b/activemodel/test/cases/serializeration/xml_serialization_test.rb
@@ -1,7 +1,9 @@
 require 'cases/helper'
 require 'models/contact'
+require 'active_support/core_ext/object/instance_variables'
 
 class Contact
+  extend ActiveModel::Naming
   include ActiveModel::Serializers::Xml
 
   def attributes
diff --git a/activemodel/test/cases/validations/presence_validation_test.rb b/activemodel/test/cases/validations/presence_validation_test.rb
index bb6fb91774..90b0951a77 100644
--- a/activemodel/test/cases/validations/presence_validation_test.rb
+++ b/activemodel/test/cases/validations/presence_validation_test.rb
@@ -5,6 +5,7 @@ require 'cases/tests_database'
 require 'models/topic'
 require 'models/developer'
 require 'models/person'
+require 'models/custom_reader'
 
 class PresenceValidationTest < ActiveModel::TestCase
   include ActiveModel::TestsDatabase
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index f55fdc5864..c290b49a28 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -1,9 +1,11 @@
 # encoding: utf-8
 require 'cases/helper'
+require 'cases/tests_database'
 
 require 'models/topic'
 
 class ValidatesWithTest < ActiveRecord::TestCase
+  include ActiveModel::TestsDatabase
   include ActiveModel::ValidationsRepairHelper
 
   repair_validations(Topic)
-- 
cgit v1.2.3