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/test/controller/mime_responds_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/test/controller/mime_responds_test.rb')

diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 6c5dc09011..be5866e5aa 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -159,7 +159,7 @@ class RespondToController < ActionController::Base
 
   protected
     def set_layout
-      if action_name.either?("all_types_with_layout", "iphone_with_html_response_type")
+      if action_name.among?("all_types_with_layout", "iphone_with_html_response_type")
         "respond_to/layouts/standard"
       elsif action_name == "iphone_with_html_response_type_without_layout"
         "respond_to/layouts/missing"
-- 
cgit v1.2.3