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.

1 files changed, 10 insertions, 4 deletions

diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index f3c1d64f7b..364dbd8e55 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -187,7 +187,7 @@ module TestHelpers
     end
 
     def boot_rails
-      require File.expand_path('../../edge_rails', __FILE__)
+      require File.expand_path('../../../../load_paths', __FILE__)
     end
   end
 end
@@ -208,12 +208,18 @@ Module.new do
   end
   FileUtils.mkdir(tmp_path)
 
-  environment = File.expand_path('../../edge_rails', __FILE__)
-  require_environment = "-r #{environment}"
+  environment = File.expand_path('../../../../load_paths', __FILE__)
+  if File.exist?("#{environment}.rb")
+    require_environment = "-r #{environment}"
+  end
 
   `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails #{tmp_path('app_template')}`
   File.open("#{tmp_path}/app_template/config/boot.rb", 'w') do |f|
-    f.puts "require '#{environment}'"
+    if require_environment
+      f.puts "Dir.chdir('#{File.dirname(environment)}') do"
+      f.puts "  require '#{environment}'"
+      f.puts "end"
+    end
     f.puts "require 'rails/all'"
   end
 end