diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-06 12:45:03 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-06 16:48:29 -0300 |
| commit | 92d761237ea9372fefd2c4e514f7f8290eb28d1e (patch) | |
| tree | c3fe5e88c7f684fc51e69d969abb0be8e418953a /actionpack/test/controller | |
| parent | de360ac565b5fea40f154f03fde3f74f0b4b31a8 (diff) | |
| download | rails-92d761237ea9372fefd2c4e514f7f8290eb28d1e.tar.gz rails-92d761237ea9372fefd2c4e514f7f8290eb28d1e.tar.bz2 rails-92d761237ea9372fefd2c4e514f7f8290eb28d1e.zip | |
Merge pull request #7848 from senny/3415_assert_template_has_nil_variable
can't pass :locals to #assert_template without a view test case (#3415)
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index afaf9e5ea9..fac48df323 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -1405,6 +1405,17 @@ class RenderTest < ActionController::TestCase assert_equal "Bonjour: davidBonjour: mary", @response.body end + def test_locals_option_to_assert_template_is_not_supported + 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 + $stderr = STDERR + end + def test_partial_collection_with_spacer get :partial_collection_with_spacer assert_equal "Hello: davidonly partialHello: mary", @response.body |