aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-02-23 17:56:28 -0800
committerCarl Lerche <carllerche@mac.com>2010-02-24 10:52:16 -0800
commitba57575e03647df78f8f2d4b56f1395c10061366 (patch)
tree1ddb0f9d5af5ad4fd6a7acc25b21c23735043cf9 /railties/test
parent60ca754b97f1254eebd61da08fb2f58f298fec31 (diff)
downloadrails-ba57575e03647df78f8f2d4b56f1395c10061366.tar.gz
rails-ba57575e03647df78f8f2d4b56f1395c10061366.tar.bz2
rails-ba57575e03647df78f8f2d4b56f1395c10061366.zip
Remove references to ActionDispatch::Routing::Routes in favor of Rails.appication.routes.
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/rails_info_controller_test.rb2
-rw-r--r--railties/test/railties/shared_tests.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index 9cfa1d6aaa..a6fc23d95b 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
- ActionDispatch::Routing::Routes.draw do |map|
+ Rails.application.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 c9e6e6081a..151abe21f8 100644
--- a/railties/test/railties/shared_tests.rb
+++ b/railties/test/railties/shared_tests.rb
@@ -133,7 +133,7 @@ module RailtiesTest
end
end
- ActionDispatch::Routing::Routes.draw do
+ Rails.application.routes.draw do
match "/sprokkit", :to => Sprokkit
end
RUBY
@@ -170,7 +170,7 @@ module RailtiesTest
RUBY
@plugin.write "config/routes.rb", <<-RUBY
- ActionDispatch::Routing::Routes.draw do |map|
+ Rails.application.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
- ActionDispatch::Routing::Routes.draw do
+ Rails.application.routes.draw do
namespace :admin do
match "index", :to => "admin/foo#index"
end