diff options
author | José Valim <jose.valim@gmail.com> | 2010-09-05 15:45:06 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-09-05 15:45:12 +0200 |
commit | 9757bfff9b7fff21697228dd0920d8ea93fae969 (patch) | |
tree | 2bc0c9acc5f17cb03b111d9448c2e100979bd0e2 /actionpack/test/abstract_unit.rb | |
parent | e20012b64b2063b75cbf1acc57195f0c410987de (diff) | |
parent | e909afccc996293ec6b7ba2d1c6c078fe807956b (diff) | |
download | rails-9757bfff9b7fff21697228dd0920d8ea93fae969.tar.gz rails-9757bfff9b7fff21697228dd0920d8ea93fae969.tar.bz2 rails-9757bfff9b7fff21697228dd0920d8ea93fae969.zip |
Merge remote branch 'drogus/remove_deprecated_routes'
This merge removes the deprecated routes mapper from Rails and update its tests.
Diffstat (limited to 'actionpack/test/abstract_unit.rb')
-rw-r--r-- | actionpack/test/abstract_unit.rb | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 869842fc9c..7080a87f42 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -49,14 +49,6 @@ require 'pp' # require 'pp' early to prevent hidden_methods from not picking up module Rails end -# Monkey patch the old routes initialization to be silenced. -class ActionDispatch::Routing::DeprecatedMapper - def initialize_with_silencer(*args) - ActiveSupport::Deprecation.silence { initialize_without_silencer(*args) } - end - alias_method_chain :initialize, :silencer -end - ActiveSupport::Dependencies.hook! # Show backtraces for deprecated behavior for quicker cleanup. @@ -128,14 +120,12 @@ module ActiveSupport # Hold off drawing routes until all the possible controller classes # have been loaded. setup_once do - SharedTestRoutes.draw do |map| - # FIXME: match ':controller(/:action(/:id))' - map.connect ':controller/:action/:id' + SharedTestRoutes.draw do + match ':controller(/:action)' end - ActionController::IntegrationTest.app.routes.draw do |map| - # FIXME: match ':controller(/:action(/:id))' - map.connect ':controller/:action/:id' + ActionController::IntegrationTest.app.routes.draw do + match ':controller(/:action)' end end end |