Permalink
Browse files

Merge bundler helper into abstract_unit

  • Loading branch information...
1 parent 0540781 commit 69192bee2da198de1bf59fbc0646e59f68e10751 @josh josh committed Sep 19, 2009
Showing with 8 additions and 12 deletions.
  1. +8 −2 actionpack/test/abstract_unit.rb
  2. +0 −10 actionpack/test/bundler_helper.rb
@@ -6,8 +6,14 @@
$:.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')
@@ -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

0 comments on commit 69192be

Please sign in to comment.