diff options
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 |