Permalink
Browse files

Merge remote branch 'drogus/remove_deprecated_routes'

This merge removes the deprecated routes mapper from Rails and update its tests.
  • Loading branch information...
josevalim committed Sep 5, 2010
2 parents e20012b + e909afc commit 9757bfff9b7fff21697228dd0920d8ea93fae969
Showing with 878 additions and 1,432 deletions.
  1. +3 −5 actionmailer/test/url_test.rb
  2. +0 −1 actionpack/lib/action_dispatch/routing.rb
  3. +0 −525 actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
  4. +30 −8 actionpack/lib/action_dispatch/routing/mapper.rb
  5. +3 −9 actionpack/lib/action_dispatch/routing/route_set.rb
  6. +4 −14 actionpack/test/abstract_unit.rb
  7. +1 −1 actionpack/test/activerecord/active_record_store_test.rb
  8. +9 −9 actionpack/test/activerecord/polymorphic_routes_test.rb
  9. +8 −11 actionpack/test/controller/action_pack_assertions_test.rb
  10. +1 −1 actionpack/test/controller/base_test.rb
  11. +2 −2 actionpack/test/controller/caching_test.rb
  12. +1 −1 actionpack/test/controller/flash_test.rb
  13. +1 −1 actionpack/test/controller/integration_test.rb
  14. +1 −1 actionpack/test/controller/mime_responds_test.rb
  15. +9 −3 actionpack/test/controller/new_base/content_type_test.rb
  16. +3 −0 actionpack/test/controller/new_base/render_action_test.rb
  17. +7 −3 actionpack/test/controller/new_base/render_template_test.rb
  18. +17 −5 actionpack/test/controller/new_base/render_test.rb
  19. +14 −6 actionpack/test/controller/new_base/render_text_test.rb
  20. +1 −1 actionpack/test/controller/redirect_test.rb
  21. +1 −1 actionpack/test/controller/render_test.rb
  22. +2 −3 actionpack/test/controller/render_xml_test.rb
  23. +1 −1 actionpack/test/controller/rescue_test.rb
  24. +315 −279 actionpack/test/controller/resources_test.rb
  25. +388 −491 actionpack/test/controller/routing_test.rb
  26. +18 −5 actionpack/test/controller/test_test.rb
  27. +5 −5 actionpack/test/controller/url_for_test.rb
  28. +5 −0 actionpack/test/controller/url_rewriter_test.rb
  29. +1 −1 actionpack/test/controller/webservice_test.rb
  30. +1 −1 actionpack/test/dispatch/request/json_params_parsing_test.rb
  31. +1 −1 actionpack/test/dispatch/request/multipart_params_parsing_test.rb
  32. +1 −1 actionpack/test/dispatch/request/query_string_parsing_test.rb
  33. +1 −1 actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
  34. +1 −1 actionpack/test/dispatch/request/xml_params_parsing_test.rb
  35. +1 −1 actionpack/test/dispatch/session/cookie_store_test.rb
  36. +1 −1 actionpack/test/dispatch/session/mem_cache_store_test.rb
  37. +1 −1 actionpack/test/template/atom_feed_helper_test.rb
  38. +2 −2 actionpack/test/template/test_case_test.rb
  39. +1 −1 actionpack/test/template/test_test.rb
  40. +2 −3 actionpack/test/template/url_helper_test.rb
  41. +0 −11 railties/lib/rails/engine.rb
  42. +2 −2 railties/test/application/initializers/i18n_test.rb
  43. +1 −1 railties/test/application/loading_test.rb
  44. +8 −8 railties/test/application/routing_test.rb
  45. +1 −1 railties/test/railties/mounted_engine_test.rb
  46. +2 −2 railties/test/railties/shared_tests.rb
@@ -56,11 +56,9 @@ def teardown
def test_signed_up_with_url
UrlTestMailer.delivery_method = :test
- assert_deprecated do
- AppRoutes.draw do |map|
- map.connect ':controller/:action/:id'
- map.welcome 'welcome', :controller=>"foo", :action=>"bar"
- end
+ AppRoutes.draw do
+ match ':controller(/:action(/:id))'
+ match '/welcome' => "foo#bar", :as => "welcome"
end
expected = new_mail
@@ -264,7 +264,6 @@ module ActionDispatch
# Target specific controllers by prefixing the command with <tt>CONTROLLER=x</tt>.
#
module Routing
- autoload :DeprecatedMapper, 'action_dispatch/routing/deprecated_mapper'
autoload :Mapper, 'action_dispatch/routing/mapper'
autoload :Route, 'action_dispatch/routing/route'
autoload :RouteSet, 'action_dispatch/routing/route_set'
Oops, something went wrong.

0 comments on commit 9757bff

Please sign in to comment.