diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-23 01:21:43 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-23 01:21:43 +0200 |
| commit | b587bfd589cbb4469b9e49bfdd90f033d14adc9a (patch) | |
| tree | d5fd06c8a1238dca62d3f3b512a6f19b63bc4b0e /actionpack/test/controller | |
| parent | 9992a1a4bff1dd666298866c283ba18832da0914 (diff) | |
| parent | 8d1ee434da3348089daa497980d1e24837ee8be6 (diff) | |
| download | rails-b587bfd589cbb4469b9e49bfdd90f033d14adc9a.tar.gz rails-b587bfd589cbb4469b9e49bfdd90f033d14adc9a.tar.bz2 rails-b587bfd589cbb4469b9e49bfdd90f033d14adc9a.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index fc85b01394..a8c74a6064 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -956,7 +956,7 @@ class RouteSetTest < ActiveSupport::TestCase params = set.recognize_path("/people", :method => :put) assert_equal("update", params[:action]) - assert_raise(ActionController::RoutingError) { + assert_raise(ActionController::UnknownHttpMethod) { set.recognize_path("/people", :method => :bacon) } |