diff options
| author | Michael Koziarski <michael@koziarski.com> | 2007-11-29 02:49:11 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2007-11-29 02:49:11 +0000 |
| commit | fd3f048f6dda74193644e2bbb23044e64df84449 (patch) | |
| tree | ca11889a6d97c3dfad4c7e063341d1414e7429b3 /actionpack/lib/action_controller | |
| parent | e302759451fbed36d7e8916d7b5c8377762e3efd (diff) | |
| download | rails-fd3f048f6dda74193644e2bbb23044e64df84449.tar.gz rails-fd3f048f6dda74193644e2bbb23044e64df84449.tar.bz2 rails-fd3f048f6dda74193644e2bbb23044e64df84449.zip | |
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
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/assertions/selector_assertions.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |