Permalink
Browse files

Merge pull request #8763 from hsbt/backport-to-hide-warning

Backport 4f0f1b5 into 3-2-stable.

When running the test with warnings enabled, it fails without this change.
  • Loading branch information...
2 parents 6b9cb71 + 8a1ba01 commit 665e11e53956269e81eacd5b0dfeebd4aef789b7 @carlosantoniodasilva carlosantoniodasilva committed Jan 5, 2013
Showing with 2 additions and 1 deletion.
  1. +2 −1 actionpack/test/controller/render_test.rb
@@ -1406,10 +1406,11 @@ def test_partial_collection_with_locals
end
def test_locals_option_to_assert_template_is_not_supported
+ get :partial_collection_with_locals
+
warning_buffer = StringIO.new
$stderr = warning_buffer
- get :partial_collection_with_locals
assert_template :partial => 'customer_greeting', :locals => { :greeting => 'Bonjour' }
assert_equal "the :locals option to #assert_template is only supported in a ActionView::TestCase\n", warning_buffer.string
ensure

0 comments on commit 665e11e

Please sign in to comment.