aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2008-04-12 12:08:45 +1200
committerMichael Koziarski <michael@koziarski.com>2008-04-12 12:08:45 +1200
commit35904e207940386192cade3d0d871fae10da0510 (patch)
tree3d04f84ed403d1a2fe847f127d834d0bcc773bc3 /actionpack/test/controller
parent6ed9e68e21b612d5f4d8d04439c165f0f28d111f (diff)
parent9a7ab8b05b748932d25d3e05a3d09600afa99f7b (diff)
downloadrails-35904e207940386192cade3d0d871fae10da0510.tar.gz
rails-35904e207940386192cade3d0d871fae10da0510.tar.bz2
rails-35904e207940386192cade3d0d871fae10da0510.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/dispatcher_test.rb2
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 }