diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-09-19 13:12:54 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-09-19 13:12:54 -0500 |
| commit | 69192bee2da198de1bf59fbc0646e59f68e10751 (patch) | |
| tree | 5d0216c299291d64211603bc96df60042fe67b07 | |
| parent | 0540781539508e09e5db176edfc72031773b0dc7 (diff) | |
| download | rails-69192bee2da198de1bf59fbc0646e59f68e10751.tar.gz rails-69192bee2da198de1bf59fbc0646e59f68e10751.tar.bz2 rails-69192bee2da198de1bf59fbc0646e59f68e10751.zip | |
Merge bundler helper into abstract_unit
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 10 | ||||
| -rw-r--r-- | actionpack/test/bundler_helper.rb | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 3bd08e04f7..b9293ffb9f 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -6,8 +6,14 @@ $:.unshift(File.dirname(__FILE__) + '/lib') $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers') $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers') -require 'bundler_helper' -ensure_requirable %w( rack rack/test sqlite3 ) +bundler = File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment') +require bundler if File.exist?("#{bundler}.rb") + +begin + %w( rack rack/test sqlite3 ).each { |lib| require lib } +rescue LoadError => e + abort e.message +end ENV['TMPDIR'] = File.join(File.dirname(__FILE__), 'tmp') diff --git a/actionpack/test/bundler_helper.rb b/actionpack/test/bundler_helper.rb deleted file mode 100644 index f7357bdb41..0000000000 --- a/actionpack/test/bundler_helper.rb +++ /dev/null @@ -1,10 +0,0 @@ -def ensure_requirable(libs) - bundler = File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment') - require bundler if File.exist?("#{bundler}.rb") - - begin - libs.each { |lib| require lib } - rescue LoadError => e - abort e.message - end -end |