kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Revert 5b7527ca "Failing test for routes with member & requirement" [#2054 state:wontfix]

Browse source
This commit is contained in:
Joshua Peek 2009-03-13 17:13:18 -05:00
parent eced3d8c55
commit 5b025a1d11
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
actionpack/lib/action_controller/resources.rb
View file

@ -670,12 +670,7 @@ module ActionController
when "show", "edit"; default_options.merge(add_conditions_for(resource.conditions, method || :get)).merge(resource.requirements(require_id))
when "update"; default_options.merge(add_conditions_for(resource.conditions, method || :put)).merge(resource.requirements(require_id))
when "destroy"; default_options.merge(add_conditions_for(resource.conditions, method || :delete)).merge(resource.requirements(require_id))
else
if method.nil? || resource.member_methods.nil? || resource.member_methods[method.to_sym].nil?
default_options.merge(add_conditions_for(resource.conditions, method)).merge(resource.requirements)
else
resource.member_methods[method.to_sym].include?(action) ? default_options.merge(add_conditions_for(resource.conditions, method)).merge(resource.requirements(require_id)) : default_options.merge(add_conditions_for(resource.conditions, method)).merge(resource.requirements)
end
else default_options.merge(add_conditions_for(resource.conditions, method)).merge(resource.requirements)
end
end
end

8
actionpack/test/controller/resources_test.rb
View file

@ -209,14 +209,6 @@ class ResourcesTest < ActionController::TestCase
end
end
def test_with_member_action_and_requirement
expected_options = {:controller => 'messages', :action => 'mark', :id => '1.1.1'}
with_restful_routing(:messages, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}, :member => { :mark => :get }) do
assert_recognizes(expected_options, :path => 'messages/1.1.1/mark', :method => :get)
end
end
def test_member_when_override_paths_for_default_restful_actions_with
[:put, :post].each do |method|
with_restful_routing :messages, :member => { :mark => method }, :path_names => {:new => 'nuevo'} do