Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge bundler helper into abstract_unit

  • Loading branch information...
commit 69192bee2da198de1bf59fbc0646e59f68e10751 1 parent 0540781
Joshua Peek josh authored
10 actionpack/test/abstract_unit.rb
View
@@ -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')
10 actionpack/test/bundler_helper.rb
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.