diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-02-23 17:31:17 -0800 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2010-02-23 17:31:17 -0800 |
| commit | 24ab5665b2f12a589e96a4b742cc49c08bf0e9df (patch) | |
| tree | cbc703c96affe65fe8f0b24c6b6241286c820ba8 /railties/test/abstract_unit.rb | |
| parent | 5e2bd08023344f3fd4675e80203a10967ffe9000 (diff) | |
| download | rails-24ab5665b2f12a589e96a4b742cc49c08bf0e9df.tar.gz rails-24ab5665b2f12a589e96a4b742cc49c08bf0e9df.tar.bz2 rails-24ab5665b2f12a589e96a4b742cc49c08bf0e9df.zip | |
Revert "Fix test load paths for those not using bundler"
This reverts commit eec2d301d4ce9df9c71c1a5aa63053eb970b6818.
This commit broke tests. You cannot have a file called "bundler" on the load path.
Diffstat (limited to 'railties/test/abstract_unit.rb')
| -rw-r--r-- | railties/test/abstract_unit.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb index 2ac165fc49..aa66dbb9be 100644 --- a/railties/test/abstract_unit.rb +++ b/railties/test/abstract_unit.rb @@ -1,13 +1,8 @@ ORIG_ARGV = ARGV.dup -require File.expand_path("../../../bundler", __FILE__) +require File.expand_path("../../../load_paths", __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' |