Skip to content

Commit 9757bff

Browse files
committed
Merge remote branch 'drogus/remove_deprecated_routes'
This merge removes the deprecated routes mapper from Rails and update its tests.
2 parents e20012b + e909afc commit 9757bff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+878
-1432
lines changed

actionmailer/test/url_test.rb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,9 @@ def teardown
5656
def test_signed_up_with_url
5757
UrlTestMailer.delivery_method = :test
5858

59-
assert_deprecated do
60-
AppRoutes.draw do |map|
61-
map.connect ':controller/:action/:id'
62-
map.welcome 'welcome', :controller=>"foo", :action=>"bar"
63-
end
59+
AppRoutes.draw do
60+
match ':controller(/:action(/:id))'
61+
match '/welcome' => "foo#bar", :as => "welcome"
6462
end
6563

6664
expected = new_mail

actionpack/lib/action_dispatch/routing.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ module ActionDispatch
264264
# Target specific controllers by prefixing the command with <tt>CONTROLLER=x</tt>.
265265
#
266266
module Routing
267-
autoload :DeprecatedMapper, 'action_dispatch/routing/deprecated_mapper'
268267
autoload :Mapper, 'action_dispatch/routing/mapper'
269268
autoload :Route, 'action_dispatch/routing/route'
270269
autoload :RouteSet, 'action_dispatch/routing/route_set'

0 commit comments

Comments
 (0)