github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-04 03:00:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix the requires in option_merger_test to unbreak AS tests

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3458 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Sam Stephenson
2006-01-21 23:52:40 +00:00
parent 5436ffa840
commit 039a90f535
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activesupport/CHANGELOG
View File

@@ -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]

6
activesupport/test/option_merger_test.rb
View File

@@ -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