diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-06-24 22:15:45 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-06-24 22:15:45 +0000 |
| commit | af33a6a6b193f4470d2c072d6fa197b72c74001b (patch) | |
| tree | 8cd07f69a0a0584528bfb27c96f39464cab08604 /actionpack | |
| parent | bb6b14b04f9d3f1e8d8811588902eb7d61fb054e (diff) | |
| download | rails-af33a6a6b193f4470d2c072d6fa197b72c74001b.tar.gz rails-af33a6a6b193f4470d2c072d6fa197b72c74001b.tar.bz2 rails-af33a6a6b193f4470d2c072d6fa197b72c74001b.zip | |
Fix problem with symbol/string mismatch on some routes
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1500 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/code_generation.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/code_generation.rb b/actionpack/lib/action_controller/code_generation.rb index 6519980198..d2d7deb212 100644 --- a/actionpack/lib/action_controller/code_generation.rb +++ b/actionpack/lib/action_controller/code_generation.rb @@ -115,7 +115,7 @@ module ActionController end code = "(#{code} || #{default.inspect})" if default - return code + return code.to_s end def segment_name() "segment#{depth}".to_sym end diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index 2e35320322..0a9453e86a 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -622,6 +622,13 @@ class RouteSetTests < Test::Unit::TestCase end end + def test_route_with_colon_first + rs.draw do |map| + map.connect '/:controller/:action/:id', :action => 'index', :id => nil + map.connect ':url', :controller => 'tiny_url', :action => 'translate' + end + end + def test_basic_named_route rs.home '', :controller => 'content', :action => 'list' x = setup_for_named_route |