mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Merge bundler helper into abstract_unit
This commit is contained in:
@@ -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')
|
||||
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user