aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-09-02 15:28:59 +0200
committerPiotr Sarnacki <drogus@gmail.com>2010-09-03 22:59:16 +0200
commitffa2acad5cee6b8c09ac95e973668d6d1a6b31e0 (patch)
treedf63c261ec9c1fdb100db0aeb33cbeaac6a4c5c7 /railties
parent9af189ac8fde1988b9695cf1459b04c9a8a042ee (diff)
downloadrails-ffa2acad5cee6b8c09ac95e973668d6d1a6b31e0.tar.gz
rails-ffa2acad5cee6b8c09ac95e973668d6d1a6b31e0.tar.bz2
rails-ffa2acad5cee6b8c09ac95e973668d6d1a6b31e0.zip
Fixed tests after rebase
Diffstat (limited to 'railties')
-rw-r--r--railties/test/railties/mounted_engine_test.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/railties/test/railties/mounted_engine_test.rb b/railties/test/railties/mounted_engine_test.rb
index b1e3e274b8..36dd01198f 100644
--- a/railties/test/railties/mounted_engine_test.rb
+++ b/railties/test/railties/mounted_engine_test.rb
@@ -56,10 +56,9 @@ module ApplicationTests
@plugin.write "config/routes.rb", <<-RUBY
Blog::Engine.routes.draw do
- resources :posts do
- get :generate_application_route
- get :application_route_in_view
- end
+ resources :posts
+ match '/generate_application_route', :to => 'posts#generate_application_route'
+ match '/application_route_in_view', :to => 'posts#application_route_in_view'
end
RUBY