Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

backport 4f0f1b5 into 3-2-stable. because 1.9.3-p362 warned unused vari... #8763

Merged
merged 1 commit into from

2 participants

@hsbt

backport 4f0f1b5.

1.9.3-p362 warned unused variables. this test failed because of this warning.

@hsbt hsbt backport #4f0f1b5 into 3-2-stable. because 1.9.3-p362 warned unused v…
…ariables.

Conflicts:
	actionpack/test/controller/render_test.rb
8a1ba01
@carlosantoniodasilva carlosantoniodasilva merged commit 665e11e into rails:3-2-stable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 5, 2013
  1. @hsbt

    backport #4f0f1b5 into 3-2-stable. because 1.9.3-p362 warned unused v…

    hsbt authored
    …ariables.
    
    Conflicts:
    	actionpack/test/controller/render_test.rb
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 1 deletion.
  1. +2 −1  actionpack/test/controller/render_test.rb
View
3  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
Something went wrong with that request. Please try again.