aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorMartin Schürrer <martin@schuerrer.org>2010-02-21 17:21:25 +0100
committerYehuda Katz <yehudakatz@YK.local>2010-02-21 13:43:51 -0800
commit6bc24d40d56332593bc22612d4618a2f80b1d91b (patch)
treee49938db28fe51f5c45efde3dec5793e65694da0 /railties/test
parent4cdfe98d925397a613c9220bca65be5081c92f56 (diff)
downloadrails-6bc24d40d56332593bc22612d4618a2f80b1d91b.tar.gz
rails-6bc24d40d56332593bc22612d4618a2f80b1d91b.tar.bz2
rails-6bc24d40d56332593bc22612d4618a2f80b1d91b.zip
Use ActionDispatch::Routing everywhere
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/rails_info_controller_test.rb2
-rw-r--r--railties/test/railties/shared_tests.rb8
2 files changed, 5 insertions, 5 deletions
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index 4163fb2c6d..9cfa1d6aaa 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -14,7 +14,7 @@ class InfoControllerTest < ActionController::TestCase
tests Rails::InfoController
def setup
- ActionController::Routing::Routes.draw do |map|
+ ActionDispatch::Routing::Routes.draw do |map|
match ':controller/:action'
end
@controller.stubs(:consider_all_requests_local? => false, :local_request? => true)
diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
index d51a0d153c..c9e6e6081a 100644
--- a/railties/test/railties/shared_tests.rb
+++ b/railties/test/railties/shared_tests.rb
@@ -133,7 +133,7 @@ module RailtiesTest
end
end
- ActionController::Routing::Routes.draw do
+ ActionDispatch::Routing::Routes.draw do
match "/sprokkit", :to => Sprokkit
end
RUBY
@@ -170,7 +170,7 @@ module RailtiesTest
RUBY
@plugin.write "config/routes.rb", <<-RUBY
- ActionController::Routing::Routes.draw do |map|
+ ActionDispatch::Routing::Routes.draw do |map|
match 'foo', :to => 'bar#index'
match 'bar', :to => 'bar#index'
end
@@ -261,7 +261,7 @@ YAML
def test_namespaced_controllers_with_namespaced_routes
@plugin.write "config/routes.rb", <<-RUBY
- ActionController::Routing::Routes.draw do
+ ActionDispatch::Routing::Routes.draw do
namespace :admin do
match "index", :to => "admin/foo#index"
end
@@ -312,4 +312,4 @@ YAML
boot_rails
end
end
-end \ No newline at end of file
+end