From fd3f048f6dda74193644e2bbb23044e64df84449 Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Thu, 29 Nov 2007 02:49:11 +0000 Subject: Make sure assert_select_rjs gets counted, Closes #10278 [tarmo] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8237 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/assertions/selector_assertions.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/actionpack/lib/action_controller/assertions/selector_assertions.rb b/actionpack/lib/action_controller/assertions/selector_assertions.rb index f70186fe17..fd2f9dff9a 100644 --- a/actionpack/lib/action_controller/assertions/selector_assertions.rb +++ b/actionpack/lib/action_controller/assertions/selector_assertions.rb @@ -439,6 +439,7 @@ module ActionController end if matches + assert_block("") { true } # to count the assertion if block_given? && !([:remove, :show, :hide, :toggle].include? rjs_type) begin in_scope, @selected = @selected, matches @@ -603,4 +604,4 @@ module ActionController end end end -end \ No newline at end of file +end -- cgit v1.2.3