diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-15 20:25:14 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-15 20:25:14 -0800 |
| commit | d7bad6e2eba5b5ea0d83a4a2a4390b057c39ec7a (patch) | |
| tree | c22938f72fb2c26d3208ad44465df287e1b477c2 /activemodel/test/test_helper.rb | |
| parent | 9e9dde617f45c24c2cf3193f639b2a9eb0332a34 (diff) | |
| download | rails-d7bad6e2eba5b5ea0d83a4a2a4390b057c39ec7a.tar.gz rails-d7bad6e2eba5b5ea0d83a4a2a4390b057c39ec7a.tar.bz2 rails-d7bad6e2eba5b5ea0d83a4a2a4390b057c39ec7a.zip | |
Use the Ruby load path for test_helper requires. Fix AM::TestCase.
Diffstat (limited to 'activemodel/test/test_helper.rb')
| -rw-r--r-- | activemodel/test/test_helper.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/activemodel/test/test_helper.rb b/activemodel/test/test_helper.rb index ccf93280ec..6c10925270 100644 --- a/activemodel/test/test_helper.rb +++ b/activemodel/test/test_helper.rb @@ -1,10 +1,6 @@ -$:.unshift "#{File.dirname(__FILE__)}/../lib" -$:.unshift File.dirname(__FILE__) - require 'test/unit' require 'active_model' require 'active_model/state_machine' -require 'active_support/callbacks' # needed by ActiveModel::TestCase require 'active_support/test_case' def uses_gem(gem_name, test_name, version = '> 0') @@ -30,10 +26,5 @@ begin rescue LoadError end -ActiveSupport::TestCase.send :include, ActiveSupport::Testing::Default - -module ActiveModel - class TestCase < ActiveSupport::TestCase - include ActiveSupport::Testing::Default - end -end
\ No newline at end of file +class ActiveModel::TestCase < ActiveSupport::TestCase +end |