From ed9567401dfc7b476bf9ccac82826fc63283f708 Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Mon, 8 Oct 2012 22:22:47 +0200 Subject: recognizes when a partial was rendered twice. Closes #3675 --- actionpack/lib/action_controller/test_case.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index ace5a2c822..6aa43edf47 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -123,11 +123,17 @@ module ActionController if expected_partial = options[:partial] if expected_locals = options[:locals] - if defined?(@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_collection = @_locals[expected_partial.to_s.sub(/^_/,'')] + result = actual_locals_collection.any? do |actual_locals| + expected_locals.each_pair.all? do |k,v| + v == actual_locals[k] + end end + msg = 'expecting %s to be rendered with %s but was with %s' % [expected_partial, + expected_locals, + actual_locals_collection] + assert(result, msg) else warn "the :locals option to #assert_template is only supported in a ActionView::TestCase" end -- cgit v1.2.3 From d6524d78687b39c72e0814e61b80e3e6b6d9997e Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Tue, 9 Oct 2012 21:14:11 +0200 Subject: refactor `ActionView::TestCase` internals to track rendered locals this refactoring extracts the semi complex data structure of rendered locals per view into into a separate class --- actionpack/lib/action_controller/test_case.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 6aa43edf47..d911d47a1d 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -123,17 +123,12 @@ module ActionController if expected_partial = options[:partial] if expected_locals = options[:locals] - if defined?(@_locals) - actual_locals_collection = @_locals[expected_partial.to_s.sub(/^_/,'')] - result = actual_locals_collection.any? do |actual_locals| - expected_locals.each_pair.all? do |k,v| - v == actual_locals[k] - end - end + if defined?(@_rendered_views) + view = expected_partial.to_s.sub(/^_/,'') msg = 'expecting %s to be rendered with %s but was with %s' % [expected_partial, expected_locals, - actual_locals_collection] - assert(result, msg) + @_rendered_views.locals_for(view)] + assert(@_rendered_views.view_rendered?(view, options[:locals]), msg) else warn "the :locals option to #assert_template is only supported in a ActionView::TestCase" end -- cgit v1.2.3