aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/abstract_unit.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-02-15 10:20:11 -0600
committerJoshua Peek <josh@joshpeek.com>2010-02-15 10:20:11 -0600
commiteec2d301d4ce9df9c71c1a5aa63053eb970b6818 (patch)
tree760bf54f7802d3e4f76e2db5bc642bb52637b532 /railties/test/abstract_unit.rb
parent7cff54f5d3ae2e364f0d147ceb86ea701b21389c (diff)
downloadrails-eec2d301d4ce9df9c71c1a5aa63053eb970b6818.tar.gz
rails-eec2d301d4ce9df9c71c1a5aa63053eb970b6818.tar.bz2
rails-eec2d301d4ce9df9c71c1a5aa63053eb970b6818.zip
Fix test load paths for those not using bundler
Diffstat (limited to 'railties/test/abstract_unit.rb')
-rw-r--r--railties/test/abstract_unit.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index aa66dbb9be..2ac165fc49 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -1,8 +1,13 @@
ORIG_ARGV = ARGV.dup
-require File.expand_path("../../../load_paths", __FILE__)
+require File.expand_path("../../../bundler", __FILE__)
$:.unshift File.expand_path("../../builtin/rails_info", __FILE__)
+lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
+
+require 'edge_rails'
+
require 'stringio'
require 'test/unit'
require 'fileutils'