diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-04 17:20:14 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-04 17:20:14 -0800 |
| commit | 665e11e53956269e81eacd5b0dfeebd4aef789b7 (patch) | |
| tree | 465ea063f6954b3cec6ec6d58bdffcbc4d880f3c | |
| parent | 6b9cb71b2fa0893139a87bee2bbd5293cd8c0487 (diff) | |
| parent | 8a1ba017c657353daebf13a1f30d1a028967dc36 (diff) | |
| download | rails-665e11e53956269e81eacd5b0dfeebd4aef789b7.tar.gz rails-665e11e53956269e81eacd5b0dfeebd4aef789b7.tar.bz2 rails-665e11e53956269e81eacd5b0dfeebd4aef789b7.zip | |
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.
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index 8c631e218f..3964540def 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -1406,10 +1406,11 @@ class RenderTest < ActionController::TestCase 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 |