Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed that map.connect should convert arguments to strings #780 [Nich…

…olas Seckar]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@855 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 688f0f6712a37474e92f86de1046f5aa0e11030e 1 parent 6e5a734
@dhh dhh authored
View
2  actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that map.connect should convert arguments to strings #780 [Nicholas Seckar]
+
* Added UrlHelper#link_to_if/link_to_unless to enable other conditions that just link_to_unless_current #757 [mindel]
* Fixed that single quote was not escaped in a UrlHelper#link_to javascript confirm #549 [Scott Barron]
View
2  actionpack/lib/action_controller/routing.rb
@@ -15,7 +15,7 @@ def initialize(path, hash={})
raise ArgumentError, "Regexp requirement on #{k}, but #{k} is not in this route's path!" unless @items.include? k
@requirements[k] = v
else
- (@items.include?(k) ? @defaults : @requirements)[k] = v
+ (@items.include?(k) ? @defaults : @requirements)[k] = (v.nil? ? nil : v.to_s)
end
end
View
13 actionpack/test/controller/routing_tests.rb
@@ -490,6 +490,19 @@ def test_url_with_dots_in_controller
@set.add_route(@rails_route) if @set.empty?
assert_raises(ActionController::RoutingError) {@set.recognize!(@request)}
end
+
+ def test_generate_of_empty_url
+ @set.connect '', :controller => 'content', :action => 'view', :id => "1"
+ @set.add_route(@rails_route)
+ verify_generate('content/view/2', {:controller => 'content', :action => 'view', :id => 2})
+ verify_generate('', {:controller => 'content', :action => 'view', :id => 1})
+ end
+ def test_generate_of_empty_url_with_numeric_requirement
+ @set.connect '', :controller => 'content', :action => 'view', :id => 1
+ @set.add_route(@rails_route)
+ verify_generate('content/view/2', {:controller => 'content', :action => 'view', :id => 2})
+ verify_generate('', {:controller => 'content', :action => 'view', :id => 1})
+ end
end
#require '../assertions/action_pack_assertions.rb'
Please sign in to comment.
Something went wrong with that request. Please try again.