diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-11 19:24:32 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-11 19:24:32 -0200 |
| commit | cf7b94c013d4e824433a018001474e71ddd81a99 (patch) | |
| tree | 67b90f1e13a88d60170469e281f081711a976194 /actionpack/test/controller/render_xml_test.rb | |
| parent | 6e55b32e98fcaad82184d2e21ee611a3465e4b20 (diff) | |
| parent | 2297eaed5b195ea42b99d062ad45f87dde9d3c60 (diff) | |
| download | rails-cf7b94c013d4e824433a018001474e71ddd81a99.tar.gz rails-cf7b94c013d4e824433a018001474e71ddd81a99.tar.bz2 rails-cf7b94c013d4e824433a018001474e71ddd81a99.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/test/controller/render_xml_test.rb')
| -rw-r--r-- | actionpack/test/controller/render_xml_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/render_xml_test.rb b/actionpack/test/controller/render_xml_test.rb index 68a52c3e8c..b5b0d0b9d5 100644 --- a/actionpack/test/controller/render_xml_test.rb +++ b/actionpack/test/controller/render_xml_test.rb @@ -61,8 +61,8 @@ class RenderXmlTest < ActionController::TestCase def test_rendering_with_object_location_should_set_header_with_url_for with_routing do |set| set.draw do |map| - map.resources :customers - map.connect ':controller/:action/:id' + resources :customers + match ':controller/:action' end get :render_with_object_location |