aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/render_xml_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-09-05 15:45:06 +0200
committerJosé Valim <jose.valim@gmail.com>2010-09-05 15:45:12 +0200
commit9757bfff9b7fff21697228dd0920d8ea93fae969 (patch)
tree2bc0c9acc5f17cb03b111d9448c2e100979bd0e2 /actionpack/test/controller/render_xml_test.rb
parente20012b64b2063b75cbf1acc57195f0c410987de (diff)
parente909afccc996293ec6b7ba2d1c6c078fe807956b (diff)
downloadrails-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/controller/render_xml_test.rb')
-rw-r--r--actionpack/test/controller/render_xml_test.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/test/controller/render_xml_test.rb b/actionpack/test/controller/render_xml_test.rb
index 4bf867fa41..ec4dc848ff 100644
--- a/actionpack/test/controller/render_xml_test.rb
+++ b/actionpack/test/controller/render_xml_test.rb
@@ -70,10 +70,9 @@ class RenderXmlTest < ActionController::TestCase
def test_rendering_with_object_location_should_set_header_with_url_for
with_routing do |set|
- set.draw do |map|
+ set.draw do
resources :customers
- # match ':controller/:action'
- map.connect ':controller/:action/:id'
+ match ':controller/:action'
end
get :render_with_object_location