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

More documentations for typos in routes. Closes #8228 [pam]

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6673 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Marcel Molina 2007-05-06 04:26:49 +00:00
parent 93c29e58f3
commit b7565075c3
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/CHANGELOG
View file

@ -1,6 +1,6 @@
*SVN*
* Fix documentation typo in routes. [norbert]
* Fix documentation typo in routes. [norbert, pam]
* Sweep flash when filter chain is halted. [Caio Chassot <lists@v2studio.com>]

2
actionpack/lib/action_controller/routing.rb
View file

@ -1279,7 +1279,7 @@ module ActionController
else
required_segments = named_route.segments.select {|seg| (!seg.optional?) && (!seg.is_a?(DividerSegment)) }
required_keys_or_values = required_segments.map { |seg| seg.key rescue seg.value } # we want either the key or the value from the segment
raise RoutingError, "#{named_route_name}_url failed to generate from #{options.inspect} - you may have ambiguous routes, or you may need to supply additional parameters for this route. content_url has the following required parameters: #{required_keys_or_values.inspect} - are they all satisifed?"
raise RoutingError, "#{named_route_name}_url failed to generate from #{options.inspect} - you may have ambiguous routes, or you may need to supply additional parameters for this route. content_url has the following required parameters: #{required_keys_or_values.inspect} - are they all satisfied?"
end
end

2
actionpack/test/controller/routing_test.rb
View file

@ -315,7 +315,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
assert_match %r[:action=>"show"], exception.message
assert_match %r[:controller=>"content"], exception.message
assert_match %r[you may have ambiguous routes, or you may need to supply additional parameters for this route], exception.message
assert_match %r[content_url has the following required parameters: \["content", :query\] - are they all satisifed?], exception.message
assert_match %r[content_url has the following required parameters: \["content", :query\] - are they all satisfied?], exception.message
end
def test_dynamic_path_allowed