diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-01-31 16:33:06 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-01-31 19:13:43 -0800 |
| commit | 9f01dff9c203821bf4ac6d7b885f1d6b018d5c79 (patch) | |
| tree | 5e7c4be2aec0f7e2bff6eac4e066a16dc4e269ad /actionpack/test | |
| parent | 9bd0422dd7b4fc9f3bebf6301b144c6a5f35c26b (diff) | |
| download | rails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.tar.gz rails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.tar.bz2 rails-9f01dff9c203821bf4ac6d7b885f1d6b018d5c79.zip | |
Get rails tests running on bundler 0.9
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 7b04638ccc..867e50d5b9 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -1,10 +1,4 @@ -begin - require File.expand_path('../../../vendor/gems/environment', __FILE__) -rescue LoadError -end - -lib = File.expand_path('../../lib', __FILE__) -$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) +require File.expand_path('../../../load_paths', __FILE__) $:.unshift(File.dirname(__FILE__) + '/lib') $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers') @@ -20,9 +14,6 @@ require 'action_view/base' require 'action_dispatch' require 'fixture_template' require 'active_support/dependencies' - -activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__) -$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path) require 'active_model' begin |