aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2009-12-21 15:50:19 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2009-12-21 15:50:19 -0800
commitfee07b9da0bddbb1833da947ed73e7a165d040e7 (patch)
tree2ca31c6143bb4741cf738da1e5be31cb446afc22 /railties
parentcf66d16bdfcb46c217ea06c05b8e0c5dfff73889 (diff)
parent880688a499b4066d6654a4cd11b76d14cc62865e (diff)
downloadrails-fee07b9da0bddbb1833da947ed73e7a165d040e7.tar.gz
rails-fee07b9da0bddbb1833da947ed73e7a165d040e7.tar.bz2
rails-fee07b9da0bddbb1833da947ed73e7a165d040e7.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/routing_test.rb18
1 files changed, 18 insertions, 0 deletions
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index decde056fd..1add941ee0 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -28,6 +28,12 @@ module ApplicationTests
end
RUBY
+ app_file 'config/routes.rb', <<-RUBY
+ ActionController::Routing::Routes.draw do |map|
+ match ':controller(/:action)'
+ end
+ RUBY
+
get '/foo'
assert_equal 'foo', last_response.body
end
@@ -49,6 +55,12 @@ module ApplicationTests
end
RUBY
+ app_file 'config/routes.rb', <<-RUBY
+ ActionController::Routing::Routes.draw do |map|
+ match ':controller(/:action)'
+ end
+ RUBY
+
get '/foo'
assert_equal 'foo', last_response.body
@@ -75,6 +87,12 @@ module ApplicationTests
end
RUBY
+ app_file 'config/routes.rb', <<-RUBY
+ ActionController::Routing::Routes.draw do |map|
+ match ':controller(/:action)'
+ end
+ RUBY
+
get '/foo'
assert_equal 'foo', last_response.body