aboutsummaryrefslogtreecommitdiffstats
path: root/load_paths.rb
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-02-23 17:31:17 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-02-23 17:31:17 -0800
commit24ab5665b2f12a589e96a4b742cc49c08bf0e9df (patch)
treecbc703c96affe65fe8f0b24c6b6241286c820ba8 /load_paths.rb
parent5e2bd08023344f3fd4675e80203a10967ffe9000 (diff)
downloadrails-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 'load_paths.rb')
-rw-r--r--load_paths.rb21
1 files changed, 21 insertions, 0 deletions
diff --git a/load_paths.rb b/load_paths.rb
new file mode 100644
index 0000000000..d5f2ca0734
--- /dev/null
+++ b/load_paths.rb
@@ -0,0 +1,21 @@
+begin
+ require File.expand_path('../.bundle/environment', __FILE__)
+rescue LoadError
+ begin
+ require 'rubygems'
+ require 'bundler'
+ Bundler.setup
+ rescue LoadError
+ %w(
+ actionmailer
+ actionpack
+ activemodel
+ activerecord
+ activeresource
+ activesupport
+ railties
+ ).each do |framework|
+ $:.unshift File.expand_path("../#{framework}/lib", __FILE__)
+ end
+ end
+end