diff options
author | Nicholas Seckar <nseckar@gmail.com> | 2006-02-26 17:49:09 +0000 |
---|---|---|
committer | Nicholas Seckar <nseckar@gmail.com> | 2006-02-26 17:49:09 +0000 |
commit | 26eaf073c4de8276663f927fdeeb91453e8b3956 (patch) | |
tree | 1690bbb49d971b063e240d155d58c503de938ee5 /actionpack/test/controller/benchmark_test.rb | |
parent | d11f8d551640c94e22c221c3bee39ab572b1dc72 (diff) | |
download | rails-26eaf073c4de8276663f927fdeeb91453e8b3956.tar.gz rails-26eaf073c4de8276663f927fdeeb91453e8b3956.tar.bz2 rails-26eaf073c4de8276663f927fdeeb91453e8b3956.zip |
Remove ::Controllers related cruft; fix AP tests
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3668 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/benchmark_test.rb')
-rw-r--r-- | actionpack/test/controller/benchmark_test.rb | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/actionpack/test/controller/benchmark_test.rb b/actionpack/test/controller/benchmark_test.rb index 7e19376101..f346e575e3 100644 --- a/actionpack/test/controller/benchmark_test.rb +++ b/actionpack/test/controller/benchmark_test.rb @@ -1,17 +1,14 @@ require File.dirname(__FILE__) + '/../abstract_unit' require 'test/unit' -# Provide a static version of the Controllers module instead of the auto-loading version. -# We don't want these tests to fail when dependencies are to blame. -module Controllers - class BenchmarkedController < ActionController::Base - def public_action - render :nothing => true - end +# Provide some static controllers. +class BenchmarkedController < ActionController::Base + def public_action + render :nothing => true + end - def rescue_action(e) - raise e - end + def rescue_action(e) + raise e end end @@ -22,7 +19,7 @@ class BenchmarkTest < Test::Unit::TestCase end def setup - @controller = Controllers::BenchmarkedController.new + @controller = BenchmarkedController.new # benchmark doesn't do anything unless a logger is set @controller.logger = MockLogger.new @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new |