diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-09-27 10:14:41 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-27 10:14:41 -0300 |
| commit | ebcd9650153ae693939550a6e08898345b986023 (patch) | |
| tree | d0892f90a630c1ef24a056520a4a990917f8280b /actionpack/lib/action_controller/test_case.rb | |
| parent | f2f6a39ccae1508c69874c6952f7d12270b876af (diff) | |
| parent | aa7c4179ff3b0dba6c14e45cecaf853ac9446d41 (diff) | |
| download | rails-ebcd9650153ae693939550a6e08898345b986023.tar.gz rails-ebcd9650153ae693939550a6e08898345b986023.tar.bz2 rails-ebcd9650153ae693939550a6e08898345b986023.zip | |
Merge pull request #26573 from kirs/action-controller-as-format
Make :as option also set request format (AC::TestCase)
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 09f2a79d85..f4ec13c831 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -498,10 +498,6 @@ module ActionController parameters ||= {} - if format - parameters[:format] = format - end - @html_document = nil cookies.update(@request.cookies) @@ -521,6 +517,10 @@ module ActionController format ||= as end + if format + parameters[:format] = format + end + parameters = parameters.symbolize_keys generated_extras = @routes.generate_extras(parameters.merge(controller: controller_class_name, action: action.to_s)) |