diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-04 08:35:35 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-04 08:35:35 -0700 |
| commit | 8b6d2ef2f562c34ebc2ef547b0a18c31f5820569 (patch) | |
| tree | b1397a8374b465ea2f300e776de126bb88386bcc /actionpack/test/controller/dispatcher_test.rb | |
| parent | d3ee8756c8b09b8524a9599926b02ededd27319c (diff) | |
| parent | bcc4537f2a0d37fc02d67e9564fa5c9c5555b3d5 (diff) | |
| download | rails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.tar.gz rails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.tar.bz2 rails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/dispatcher_test.rb')
| -rw-r--r-- | actionpack/test/controller/dispatcher_test.rb | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/actionpack/test/controller/dispatcher_test.rb b/actionpack/test/controller/dispatcher_test.rb index c3bd113b86..b315232a7b 100644 --- a/actionpack/test/controller/dispatcher_test.rb +++ b/actionpack/test/controller/dispatcher_test.rb @@ -45,19 +45,6 @@ class DispatcherTest < Test::Unit::TestCase def log_failsafe_exception(status, exception); end end - def test_failsafe_response - Dispatcher.any_instance.expects(:_call).raises('b00m') - ActionDispatch::Failsafe.any_instance.expects(:log_failsafe_exception) - - assert_nothing_raised do - assert_equal [ - 500, - {"Content-Type" => "text/html"}, - ["<html><body><h1>500 Internal Server Error</h1></body></html>"] - ], dispatch - end - end - def test_prepare_callbacks a = b = c = nil Dispatcher.to_prepare { |*args| a = b = c = 1 } |