aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-02-24 16:01:32 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-02-25 17:53:01 -0800
commit4b038f638d8c8969b2bccac82d0d7a370381680b (patch)
tree39160b2d2e95ed260d675b46380f39da8a7235d8
parent226dfc2681c98deaf14e4ae82e973d1d5caedd68 (diff)
downloadrails-4b038f638d8c8969b2bccac82d0d7a370381680b.tar.gz
rails-4b038f638d8c8969b2bccac82d0d7a370381680b.tar.bz2
rails-4b038f638d8c8969b2bccac82d0d7a370381680b.zip
Merge branch 'master' of github.com:rails/rails
-rw-r--r--actionpack/test/controller/webservice_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index ede48017cf..05545395fb 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -245,7 +245,7 @@ class WebServiceTest < ActionController::IntegrationTest
private
def with_params_parsers(parsers = {})
old_session = @integration_session
- @app = ActionDispatch::ParamsParser.new(ActionDispatch::Routing::Routes, parsers)
+ @app = ActionDispatch::ParamsParser.new(app.router, parsers)
reset!
yield
ensure