mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
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
This commit is contained in:
parent
e302759451
commit
fd3f048f6d
1 changed files with 2 additions and 1 deletions
|
@ -439,6 +439,7 @@ module ActionController
|
||||||
end
|
end
|
||||||
|
|
||||||
if matches
|
if matches
|
||||||
|
assert_block("") { true } # to count the assertion
|
||||||
if block_given? && !([:remove, :show, :hide, :toggle].include? rjs_type)
|
if block_given? && !([:remove, :show, :hide, :toggle].include? rjs_type)
|
||||||
begin
|
begin
|
||||||
in_scope, @selected = @selected, matches
|
in_scope, @selected = @selected, matches
|
||||||
|
@ -603,4 +604,4 @@ module ActionController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue