Permalink
Browse files

Merge pull request #9754 from macksmind/fix_actionpack_warnings

Fix rake test warnings in actionpack
  • Loading branch information...
2 parents 28cb110 + c23f3aa commit b365354e593da172c55770aed22c8211dbc18b08 @rafaelfranca rafaelfranca committed Mar 17, 2013
Showing with 3 additions and 2 deletions.
  1. +2 −1 actionpack/lib/action_view/template.rb
  2. +1 −1 actionpack/test/controller/test_case_test.rb
@@ -324,7 +324,8 @@ def handle_render_error(view, e) #:nodoc:
end
def locals_code #:nodoc:
- @locals.map { |key| "#{key} = local_assigns[:#{key}];" }.join
+ # Double assign to suppress the dreaded 'assigned but unused variable' warning
+ @locals.map { |key| "#{key} = #{key} = local_assigns[:#{key}];" }.join
end
def method_name #:nodoc:
@@ -58,7 +58,7 @@ def test_protocol
end
def test_headers
- render text: JSON.dump(request.headers.env)
+ render text: request.headers.env.to_json
end
def test_html_output

0 comments on commit b365354

Please sign in to comment.