diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2012-03-20 22:16:44 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2012-03-20 22:16:44 +0100 |
| commit | 275ee0dc7b836fb10aa8af1c0339e81539c1dec1 (patch) | |
| tree | 7cc21f2954f208836ac9c20d07800b688a90b834 /actionpack | |
| parent | 358333f8886b00241706a593c0ce7727470667ed (diff) | |
| download | rails-275ee0dc7b836fb10aa8af1c0339e81539c1dec1.tar.gz rails-275ee0dc7b836fb10aa8af1c0339e81539c1dec1.tar.bz2 rails-275ee0dc7b836fb10aa8af1c0339e81539c1dec1.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')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 1 |
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 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! |