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 /actionpack/test/activerecord | |
| 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 'actionpack/test/activerecord')
| -rw-r--r-- | actionpack/test/activerecord/controller_runtime_test.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/actionpack/test/activerecord/controller_runtime_test.rb b/actionpack/test/activerecord/controller_runtime_test.rb index ee5fbdb0ae..d089830857 100644 --- a/actionpack/test/activerecord/controller_runtime_test.rb +++ b/actionpack/test/activerecord/controller_runtime_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 'active_record_unit' require 'active_record/railties/controller_runtime' require 'fixtures/project' @@ -15,7 +12,7 @@ class ControllerRuntimeLogSubscriberTest < ActionController::TestCase render :inline => "<%= Project.all %>" end end - + include Rails::LogSubscriber::TestHelper tests LogSubscriberController @@ -42,4 +39,4 @@ class ControllerRuntimeLogSubscriberTest < ActionController::TestCase assert_equal 2, @logger.logged(:info).size assert_match /\(Views: [\d\.]+ms | ActiveRecord: [\d\.]+ms\)/, @logger.logged(:info)[1] end -end +end
\ No newline at end of file |