Revert 5b7527c "Failing test for routes with member & requirement" [#…

…2054 state:wontfix]
rails · Mar 13, 2009 · 5b025a1 · 5b025a1
1 parent eced3d8
commit 5b025a1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/actionpack/lib/action_controller/resources.rb b/actionpack/lib/action_controller/resources.rb
@@ -670,12 +670,7 @@ def action_options_for(action, resource, method = nil)
           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

diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
@@ -209,14 +209,6 @@ def test_with_member_action
     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