diff options
author | José Valim <jose.valim@gmail.com> | 2010-09-05 15:45:06 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-09-05 15:45:12 +0200 |
commit | 9757bfff9b7fff21697228dd0920d8ea93fae969 (patch) | |
tree | 2bc0c9acc5f17cb03b111d9448c2e100979bd0e2 /actionpack/test/dispatch/request | |
parent | e20012b64b2063b75cbf1acc57195f0c410987de (diff) | |
parent | e909afccc996293ec6b7ba2d1c6c078fe807956b (diff) | |
download | rails-9757bfff9b7fff21697228dd0920d8ea93fae969.tar.gz rails-9757bfff9b7fff21697228dd0920d8ea93fae969.tar.bz2 rails-9757bfff9b7fff21697228dd0920d8ea93fae969.zip |
Merge remote branch 'drogus/remove_deprecated_routes'
This merge removes the deprecated routes mapper from Rails and update its tests.
Diffstat (limited to 'actionpack/test/dispatch/request')
5 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb index 0faa99a912..b6dee77203 100644 --- a/actionpack/test/dispatch/request/json_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb @@ -56,7 +56,7 @@ class JsonParamsParsingTest < ActionController::IntegrationTest def with_test_routing with_routing do |set| - set.draw do |map| + set.draw do match ':action', :to => ::JsonParamsParsingTest::TestController end yield diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb index e3ec5cf182..e701185b61 100644 --- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb @@ -156,7 +156,7 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest def with_test_routing with_routing do |set| - set.draw do |map| + set.draw do match ':action', :to => 'multipart_params_parsing_test/test' end yield diff --git a/actionpack/test/dispatch/request/query_string_parsing_test.rb b/actionpack/test/dispatch/request/query_string_parsing_test.rb index 071d80c5b0..8d67df433c 100644 --- a/actionpack/test/dispatch/request/query_string_parsing_test.rb +++ b/actionpack/test/dispatch/request/query_string_parsing_test.rb @@ -108,7 +108,7 @@ class QueryStringParsingTest < ActionController::IntegrationTest private def assert_parses(expected, actual) with_routing do |set| - set.draw do |map| + set.draw do match ':action', :to => ::QueryStringParsingTest::TestController end diff --git a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb index 0bcef81534..b179f08f4e 100644 --- a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb @@ -129,7 +129,7 @@ class UrlEncodedParamsParsingTest < ActionController::IntegrationTest private def with_test_routing with_routing do |set| - set.draw do |map| + set.draw do match ':action', :to => ::UrlEncodedParamsParsingTest::TestController end yield diff --git a/actionpack/test/dispatch/request/xml_params_parsing_test.rb b/actionpack/test/dispatch/request/xml_params_parsing_test.rb index d44c642420..9d0695bf64 100644 --- a/actionpack/test/dispatch/request/xml_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/xml_params_parsing_test.rb @@ -96,7 +96,7 @@ class XmlParamsParsingTest < ActionController::IntegrationTest private def with_test_routing with_routing do |set| - set.draw do |map| + set.draw do match ':action', :to => ::XmlParamsParsingTest::TestController end yield |