diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-24 11:11:08 +0100 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-24 11:11:08 +0100 |
commit | f3f67ce6212e2ae35470ab2960bb4967ae967ee2 (patch) | |
tree | 6a3054b9e4882a3faea6acc8b935db16a0831c4e /activesupport/test | |
parent | eea5dc3a34328267407f2cb861e14d9d1f5d7c02 (diff) | |
parent | 2dd0ec48a5068a095e362fad2a77d63b86fdfd95 (diff) | |
download | rails-f3f67ce6212e2ae35470ab2960bb4967ae967ee2.tar.gz rails-f3f67ce6212e2ae35470ab2960bb4967ae967ee2.tar.bz2 rails-f3f67ce6212e2ae35470ab2960bb4967ae967ee2.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activesupport/test')
-rw-r--r-- | activesupport/test/abstract_unit.rb | 2 | ||||
-rw-r--r-- | activesupport/test/core_ext/hash_ext_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index 4655f23a34..ac362d14c8 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -1,6 +1,6 @@ require 'rubygems' require 'test/unit' -gem 'mocha', '>= 0.9.0' +gem 'mocha', '>= 0.9.3' require 'mocha' $:.unshift "#{File.dirname(__FILE__)}/../lib" diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb index 1e5cd25527..30cbba26b0 100644 --- a/activesupport/test/core_ext/hash_ext_test.rb +++ b/activesupport/test/core_ext/hash_ext_test.rb @@ -1,4 +1,5 @@ require 'abstract_unit' +require 'builder' class HashExtTest < Test::Unit::TestCase def setup |