diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-27 14:44:21 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-27 14:44:21 -0800 |
| commit | 5012a1558dd1483df525f1fac1e649e089be886a (patch) | |
| tree | 983136a50ee7bb135768038e33c9c226a3a167ed /actionpack/test/controller/benchmark_test.rb | |
| parent | 1cd949006a419807d5ae3400442942b752780ca2 (diff) | |
| parent | 12e43494a748e0144195be12dc19161cc3e4d39f (diff) | |
| download | rails-5012a1558dd1483df525f1fac1e649e089be886a.tar.gz rails-5012a1558dd1483df525f1fac1e649e089be886a.tar.bz2 rails-5012a1558dd1483df525f1fac1e649e089be886a.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/benchmark_test.rb')
| -rw-r--r-- | actionpack/test/controller/benchmark_test.rb | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/actionpack/test/controller/benchmark_test.rb b/actionpack/test/controller/benchmark_test.rb deleted file mode 100644 index 66ebfcf20a..0000000000 --- a/actionpack/test/controller/benchmark_test.rb +++ /dev/null @@ -1,33 +0,0 @@ -require 'abstract_unit' - -# Provide some static controllers. -class BenchmarkedController < ActionController::Base - def public_action - render :nothing => true - end - - def rescue_action(e) - raise e - end -end - -class BenchmarkTest < ActionController::TestCase - tests BenchmarkedController - - class MockLogger - def method_missing(*args) - end - end - - def setup - super - # benchmark doesn't do anything unless a logger is set - @controller.logger = MockLogger.new - @request.host = "test.actioncontroller.i" - end - - def test_with_http_1_0_request - @request.host = nil - assert_nothing_raised { get :public_action } - end -end |