diff options
| author | José Valim <jose.valim@gmail.com> | 2010-02-17 00:48:04 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-02-17 00:48:04 +0100 |
| commit | 3f948a0e2951a8bb7f32e98a404fb5ff97cb2896 (patch) | |
| tree | 8528d926c137a3a0f18c21642a8b6be1f334b6df /actionpack/test/abstract_unit.rb | |
| parent | d4e008fd0f9ebac3383a0c3ac093de68db9e2e66 (diff) | |
| parent | 762088a0ef1f69ab09833732cfe8190098303ee6 (diff) | |
| download | rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.tar.gz rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.tar.bz2 rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.zip | |
Merge master.
Diffstat (limited to 'actionpack/test/abstract_unit.rb')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 867e50d5b9..655a133c96 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -1,4 +1,10 @@ -require File.expand_path('../../../load_paths', __FILE__) +require File.expand_path('../../../bundler', __FILE__) + +lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") +$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) + +activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__) +$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path) $:.unshift(File.dirname(__FILE__) + '/lib') $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers') |