aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_case.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2012-03-20 22:16:44 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2012-03-20 22:23:18 +0100
commitb49a7ddce18a35a39fd5b3f6003d4a02cbd09b0e (patch)
tree44c8394ff5c67b28a2fdb00bf5f1b2fa1517fc89 /actionpack/lib/action_controller/test_case.rb
parentbdf7624a5998b1a476d416c72cd58448c8c2454c (diff)
downloadrails-b49a7ddce18a35a39fd5b3f6003d4a02cbd09b0e.tar.gz
rails-b49a7ddce18a35a39fd5b3f6003d4a02cbd09b0e.tar.bz2
rails-b49a7ddce18a35a39fd5b3f6003d4a02cbd09b0e.zip
We dont need to merge in the parameters as thats all being reset by the rack headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
-rw-r--r--actionpack/lib/action_controller/test_case.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 7ba8319e4c..9bd2e622ad 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -479,7 +479,6 @@ module ActionController
@request.session["flash"].sweep
@controller.request = @request
- @controller.params.merge!(parameters)
build_request_uri(action, parameters)
@controller.class.class_eval { include Testing }
@controller.recycle!