diff options
| author | rick <rick@spacemonkey.local> | 2008-04-17 17:22:03 -0700 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-04-17 17:22:03 -0700 |
| commit | 69d29e80f76079262f2e98e350592be1cfdfcd1e (patch) | |
| tree | e5b65fae3a5d54c93f660f2b56980acb86d5ff68 /actionpack | |
| parent | 750e3217e13f385c5305e5ed9906703412e5667c (diff) | |
| parent | 82b4faf81218bbd8916ab559590db236c7f80e46 (diff) | |
| download | rails-69d29e80f76079262f2e98e350592be1cfdfcd1e.tar.gz rails-69d29e80f76079262f2e98e350592be1cfdfcd1e.tar.bz2 rails-69d29e80f76079262f2e98e350592be1cfdfcd1e.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/controller/dispatcher_test.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/actionpack/test/controller/dispatcher_test.rb b/actionpack/test/controller/dispatcher_test.rb index 9f90872734..c4f49f1e16 100644 --- a/actionpack/test/controller/dispatcher_test.rb +++ b/actionpack/test/controller/dispatcher_test.rb @@ -37,11 +37,14 @@ class DispatcherTest < Test::Unit::TestCase dispatch end + # Stub out dispatch error logger + class << Dispatcher + def log_failsafe_exception(status, exception); end + end + def test_failsafe_response CGI.expects(:new).raises('some multipart parsing failure') - - ActionController::Routing::Routes.stubs(:reload) - Dispatcher.any_instance.stubs(:log_failsafe_exception) + Dispatcher.expects(:log_failsafe_exception) assert_nothing_raised { dispatch } |