From 6bc24d40d56332593bc22612d4618a2f80b1d91b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sch=C3=BCrrer?= Date: Sun, 21 Feb 2010 17:21:25 +0100 Subject: Use ActionDispatch::Routing everywhere --- railties/test/rails_info_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/test/rails_info_controller_test.rb') 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) -- cgit v1.2.3 From ba57575e03647df78f8f2d4b56f1395c10061366 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Tue, 23 Feb 2010 17:56:28 -0800 Subject: Remove references to ActionDispatch::Routing::Routes in favor of Rails.appication.routes. --- railties/test/rails_info_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/test/rails_info_controller_test.rb') 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) -- cgit v1.2.3 From 9a5be2e5a80ab9e74294f32cfef58fbbcd9b637c Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Wed, 24 Feb 2010 16:47:43 -0800 Subject: Get Railties tests passing --- railties/test/rails_info_controller_test.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'railties/test/rails_info_controller_test.rb') diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb index a6fc23d95b..017e51326c 100644 --- a/railties/test/rails_info_controller_test.rb +++ b/railties/test/rails_info_controller_test.rb @@ -18,6 +18,9 @@ class InfoControllerTest < ActionController::TestCase match ':controller/:action' end @controller.stubs(:consider_all_requests_local? => false, :local_request? => true) + @router = Rails.application.routes + + Rails::InfoController.send(:include, @router.named_url_helpers) end test "info controller does not allow remote requests" do -- cgit v1.2.3 From 98f77e08278658ec47c9eb2e8f819d781c1eaebf Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Fri, 26 Feb 2010 15:00:33 -0800 Subject: Rename named_url_helpers to url_helpers and url_helpers to url_for --- railties/test/rails_info_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/test/rails_info_controller_test.rb') diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb index 017e51326c..7275755130 100644 --- a/railties/test/rails_info_controller_test.rb +++ b/railties/test/rails_info_controller_test.rb @@ -20,7 +20,7 @@ class InfoControllerTest < ActionController::TestCase @controller.stubs(:consider_all_requests_local? => false, :local_request? => true) @router = Rails.application.routes - Rails::InfoController.send(:include, @router.named_url_helpers) + Rails::InfoController.send(:include, @router.url_helpers) end test "info controller does not allow remote requests" do -- cgit v1.2.3 From a64fcc1a8d84b274691b5e332257eabf0cb5c2a8 Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Tue, 2 Mar 2010 12:06:40 -0800 Subject: :controller doesn't work for namespaced controllers anymore. --- railties/test/rails_info_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/test/rails_info_controller_test.rb') diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb index 7275755130..d904d7b461 100644 --- a/railties/test/rails_info_controller_test.rb +++ b/railties/test/rails_info_controller_test.rb @@ -15,7 +15,7 @@ class InfoControllerTest < ActionController::TestCase def setup Rails.application.routes.draw do |map| - match ':controller/:action' + match '/rails/info/properties' => "rails/info#properties" end @controller.stubs(:consider_all_requests_local? => false, :local_request? => true) @router = Rails.application.routes -- cgit v1.2.3