From d1575ae1b9658c91145d6a46ec2a144a5a089207 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 12 Apr 2011 00:23:07 +0200
Subject: Change Object#either? to Object#among? -- thanks to @jamesarosen for
 the suggestion!

---
 actionpack/lib/action_dispatch/testing/assertions/response.rb | 2 +-
 actionpack/lib/action_dispatch/testing/assertions/selector.rb | 2 +-
 actionpack/lib/action_dispatch/testing/integration.rb         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack/lib/action_dispatch/testing')

diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index d3e7fa388f..16a6b93ce8 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -35,7 +35,7 @@ module ActionDispatch
       def assert_response(type, message = nil)
         validate_request!
 
-        if type.either?(:success, :missing, :redirect, :error) && @response.send("#{type}?")
+        if type.among?(:success, :missing, :redirect, :error) && @response.send("#{type}?")
           assert_block("") { true } # to count the assertion
         elsif type.is_a?(Fixnum) && @response.response_code == type
           assert_block("") { true } # to count the assertion
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
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index a508020368..174babb9aa 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -321,7 +321,7 @@ module ActionDispatch
         define_method(method) do |*args|
           reset! unless integration_session
           # reset the html_document variable, but only for new get/post calls
-          @html_document = nil unless method.either?("cookies", "assigns")
+          @html_document = nil unless method.among?("cookies", "assigns")
           integration_session.__send__(method, *args).tap do
             copy_session_variables!
           end
-- 
cgit v1.2.3