diff options
| author | Michael Koziarski <michael@koziarski.com> | 2008-04-12 12:40:51 +1200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-04-12 12:40:51 +1200 |
| commit | 60be4b09f51d2560802ebd744893bb6f737ef57c (patch) | |
| tree | 391bca0d96a5fb4071467350fd7fdac4e3cfd6f4 /actionpack/test/controller | |
| parent | 063c393bf0a2eb762770c97f925b7c2867361ad4 (diff) | |
| parent | 35904e207940386192cade3d0d871fae10da0510 (diff) | |
| download | rails-60be4b09f51d2560802ebd744893bb6f737ef57c.tar.gz rails-60be4b09f51d2560802ebd744893bb6f737ef57c.tar.bz2 rails-60be4b09f51d2560802ebd744893bb6f737ef57c.zip | |
Merge branch 'master' into custom_paths_for_resource_names
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/dispatcher_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/dispatcher_test.rb b/actionpack/test/controller/dispatcher_test.rb index 84a1c9aab9..9f90872734 100644 --- a/actionpack/test/controller/dispatcher_test.rb +++ b/actionpack/test/controller/dispatcher_test.rb @@ -41,7 +41,7 @@ class DispatcherTest < Test::Unit::TestCase CGI.expects(:new).raises('some multipart parsing failure') ActionController::Routing::Routes.stubs(:reload) - Dispatcher.stubs(:log_failsafe_exception) + Dispatcher.any_instance.stubs(:log_failsafe_exception) assert_nothing_raised { dispatch } |