fixed up rails-3 verb routing. convert 'method' into 'via' [mchung]
This commit is contained in:
commit
c1fdcfc44f
@ -251,11 +251,15 @@ module Rails
|
||||
if @options[:conditions]
|
||||
@options[:via] = @options.delete(:conditions).delete(:method)
|
||||
end
|
||||
|
||||
|
||||
if @options[:method]
|
||||
@options[:via] = @options.delete(:method).to_s
|
||||
end
|
||||
|
||||
@options ||= {}
|
||||
base = (base % [@path, @options.delete(:controller), (@options.delete(:action) || "index")])
|
||||
opts = opts_to_string(@options)
|
||||
|
||||
|
||||
route_pieces = ([base] + extra_options + [opts])
|
||||
route_pieces.delete("")
|
||||
|
||||
|
@ -145,6 +145,7 @@ end
|
||||
assert_equal new_routes_code, result
|
||||
end
|
||||
|
||||
|
||||
def test_preserves_resources_except_option
|
||||
route = Rails::Upgrading::FakeResourceRoute.new("hats", :except => [:index])
|
||||
assert_equal "resources :hats, :except => [:index]", route.to_route_code
|
||||
@ -154,4 +155,22 @@ end
|
||||
route = Rails::Upgrading::FakeResourceRoute.new("hats", :only => :show)
|
||||
assert_equal "resources :hats, :only => :show", route.to_route_code
|
||||
end
|
||||
|
||||
def test_generates_code_for_delete_route
|
||||
routes_code = %Q{
|
||||
ActionController::Routing::Routes.draw do |map|
|
||||
map.sign_out '/sign_out', :controller => 'sessions', :action => 'destroy', :method => :delete
|
||||
end
|
||||
}
|
||||
|
||||
new_routes_code = %Q{
|
||||
MyApplication::Application.routes.draw do
|
||||
match '/sign_out' => 'sessions#destroy', :as => :sign_out, :via => 'delete'
|
||||
end
|
||||
}
|
||||
|
||||
upgrader = Rails::Upgrading::RoutesUpgrader.new
|
||||
upgrader.routes_code = routes_code
|
||||
assert_equal new_routes_code, upgrader.generate_new_routes
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue
Block a user