aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing/assertions/selector.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2011-04-12 00:23:07 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2011-04-12 00:23:07 +0200
commitd1575ae1b9658c91145d6a46ec2a144a5a089207 (patch)
treed630cd4ba2cd512c3be56e33d4e7b45e0cf8fff4 /actionpack/lib/action_dispatch/testing/assertions/selector.rb
parent5918b868b24ff384365d436367611aea577f3723 (diff)
downloadrails-d1575ae1b9658c91145d6a46ec2a144a5a089207.tar.gz
rails-d1575ae1b9658c91145d6a46ec2a144a5a089207.tar.bz2
rails-d1575ae1b9658c91145d6a46ec2a144a5a089207.zip
Change Object#either? to Object#among? -- thanks to @jamesarosen for the suggestion!
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions/selector.rb')
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/selector.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index 3346fa2a04..f41d3e5ddb 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -442,7 +442,7 @@ module ActionDispatch
if matches
assert_block("") { true } # to count the assertion
- if block_given? && !rjs_type.either?(:remove, :show, :hide, :toggle)
+ if block_given? && !rjs_type.among?(:remove, :show, :hide, :toggle)
begin
@selected ||= nil
in_scope, @selected = @selected, matches