aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract_unit.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-12-11 19:24:32 -0200
committerJosé Valim <jose.valim@gmail.com>2009-12-11 19:24:32 -0200
commitcf7b94c013d4e824433a018001474e71ddd81a99 (patch)
tree67b90f1e13a88d60170469e281f081711a976194 /actionpack/test/abstract_unit.rb
parent6e55b32e98fcaad82184d2e21ee611a3465e4b20 (diff)
parent2297eaed5b195ea42b99d062ad45f87dde9d3c60 (diff)
downloadrails-cf7b94c013d4e824433a018001474e71ddd81a99.tar.gz
rails-cf7b94c013d4e824433a018001474e71ddd81a99.tar.bz2
rails-cf7b94c013d4e824433a018001474e71ddd81a99.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/test/abstract_unit.rb')
-rw-r--r--actionpack/test/abstract_unit.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 9d055da4b9..eab9f8b83d 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -83,7 +83,7 @@ class ActiveSupport::TestCase
# have been loaded.
setup_once do
ActionController::Routing::Routes.draw do |map|
- map.connect ':controller/:action/:id'
+ match ':controller(/:action(/:id))'
end
end
end