aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
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 /actionpack/test/controller
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 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/log_subscriber_test.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index 5a3a2dd3ea..668d6ae5ea 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -1,6 +1,3 @@
-railties_path = File.expand_path('../../../../railties/lib', __FILE__)
-$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path)
-
require "abstract_unit"
require "rails/log_subscriber/test_helper"
require "action_controller/railties/log_subscriber"