Fix the requires in option_merger_test to unbreak AS tests

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3458 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Jan 21, 2006 · 039a90f · 039a90f
1 parent 5436ffa
commit 039a90f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fix the requires in option_merger_test to unbreak AS tests. [Sam Stephenson]
+
 * Make HashWithIndifferentAccess#update behave like Hash#update by returning the hash. #3419, #3425 [asnem@student.ethz.ch, JanPrill@blauton.de, Marcel Molina Jr.]
 
 * Add ActiveSupport::JSON and Object#to_json for converting Ruby objects to JSON strings. [Sam Stephenson]

diff --git a/activesupport/test/option_merger_test.rb b/activesupport/test/option_merger_test.rb
@@ -1,7 +1,9 @@
 require 'test/unit'
 
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-require 'active_support'
+unless defined? ActiveSupport::OptionMerger
+  require File.dirname(__FILE__) + '/../lib/active_support/option_merger'
+  require File.dirname(__FILE__) + '/../lib/active_support/core_ext/object_and_class'
+end
 
 class OptionMergerTest < Test::Unit::TestCase
   def setup