From 275ee0dc7b836fb10aa8af1c0339e81539c1dec1 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 20 Mar 2012 22:16:44 +0100 Subject: 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) --- actionpack/lib/action_controller/test_case.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'actionpack/lib/action_controller/test_case.rb') diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index c985a8ca10..d641fc6345 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -457,7 +457,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! -- cgit v1.2.3