aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/webservice_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-12-11 19:24:32 -0200
committerJosé Valim <jose.valim@gmail.com>2009-12-11 19:24:32 -0200
commitcf7b94c013d4e824433a018001474e71ddd81a99 (patch)
tree67b90f1e13a88d60170469e281f081711a976194 /actionpack/test/controller/webservice_test.rb
parent6e55b32e98fcaad82184d2e21ee611a3465e4b20 (diff)
parent2297eaed5b195ea42b99d062ad45f87dde9d3c60 (diff)
downloadrails-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/webservice_test.rb')
-rw-r--r--actionpack/test/controller/webservice_test.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index 0514c098bf..5882a8cfa3 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -255,9 +255,7 @@ class WebServiceTest < ActionController::IntegrationTest
def with_test_route_set
with_routing do |set|
set.draw do |map|
- map.with_options :controller => "web_service_test/test" do |c|
- c.connect "/", :action => "assign_parameters"
- end
+ match '/', :to => 'web_service_test/test#assign_parameters'
end
yield
end