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/lib/action_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/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 3a7fe22a9c..d486f32c01 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -110,9 +110,13 @@ module ActionController if expected_partial = options[:partial] if expected_locals = options[:locals] - actual_locals = @locals[expected_partial.to_s.sub(/^_/,'')] - expected_locals.each_pair do |k,v| - assert_equal(v, actual_locals[k]) + if defined?(@locals) + actual_locals = @locals[expected_partial.to_s.sub(/^_/,'')] + expected_locals.each_pair do |k,v| + assert_equal(v, actual_locals[k]) + end + else + warn "the :locals option to #assert_template is only supported in a ActionView::TestCase" end elsif expected_count = options[:count] actual_count = @_partials[expected_partial] |