From 5e0f6214d2421a4931c85ee6a239158c69e57b65 Mon Sep 17 00:00:00 2001 From: Mike Gunderloy Date: Sun, 8 Mar 2009 07:31:27 -0500 Subject: [PATCH] Support OPTIONS verb in route conditions [#1727 state:resolved] Signed-off-by: Pratik Naik --- actionpack/lib/action_controller/routing.rb | 2 +- actionpack/test/controller/routing_test.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index a2141a77dc..c0eb61340b 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -267,7 +267,7 @@ module ActionController module Routing SEPARATORS = %w( / . ? ) - HTTP_METHODS = [:get, :head, :post, :put, :delete] + HTTP_METHODS = [:get, :head, :post, :put, :delete, :options] ALLOWED_REQUIREMENTS_FOR_OPTIMISATION = [:controller, :action].to_set diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index 01b3db64fc..55f3ad23be 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -1865,6 +1865,14 @@ class RouteSetTest < Test::Unit::TestCase end end + def test_route_requirements_with_options_method_condition_is_valid + assert_nothing_raised do + set.draw do |map| + map.connect 'valid/route', :controller => 'pages', :action => 'show', :conditions => {:method => :options} + end + end + end + def test_route_requirements_with_head_method_condition_is_invalid assert_raises ArgumentError do set.draw do |map|