diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-11-09 23:28:36 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-11-09 23:28:36 -0600 |
| commit | 11e798ae0f2f46498811282756c9d21df3d4b523 (patch) | |
| tree | 460a4afcd2b25cede89f2e2c785244dbcc97656f /actionpack/test/abstract_unit.rb | |
| parent | 23229d5ad4cf1c222d4d8c4561fbdff284f9bdee (diff) | |
| download | rails-11e798ae0f2f46498811282756c9d21df3d4b523.tar.gz rails-11e798ae0f2f46498811282756c9d21df3d4b523.tar.bz2 rails-11e798ae0f2f46498811282756c9d21df3d4b523.zip | |
Avoid adding component lib/ to load path multiple times
Diffstat (limited to 'actionpack/test/abstract_unit.rb')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 32c5743382..775cfc82bf 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -6,7 +6,9 @@ rescue LoadError $:.unshift "#{root}/activemodel/lib" end -$:.unshift(File.dirname(__FILE__) + '/../lib') +lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") +$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) + $:.unshift(File.dirname(__FILE__) + '/lib') $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers') $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers') |