From 8a1ba017c657353daebf13a1f30d1a028967dc36 Mon Sep 17 00:00:00 2001 From: SHIBATA Hiroshi Date: Thu, 20 Dec 2012 16:49:00 +0900 Subject: backport #4f0f1b5 into 3-2-stable. because 1.9.3-p362 warned unused variables. Conflicts: actionpack/test/controller/render_test.rb --- actionpack/test/controller/render_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actionpack/test/controller/render_test.rb') 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 -- cgit v1.2.3