From dee5915aac009b6b6456a81ae7b8927866d0c240 Mon Sep 17 00:00:00 2001
From: Fred Wu <ifredwu@gmail.com>
Date: Wed, 27 Mar 2013 11:29:37 +1100
Subject: Fixed test failures on 1.8.7 caused by 74e59ea

---
 actionpack/lib/action_controller/test_case.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index cd9848d65b..dc58166f78 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -110,7 +110,7 @@ module ActionController
 
           case expected_layout
           when String, Symbol
-            assert_includes @layouts.keys, expected_layout.to_s, msg
+            assert(@layouts.keys.include?(expected_layout.to_s), msg)
           when Regexp
             assert(@layouts.keys.any? {|l| l =~ expected_layout }, msg)
           when nil, false
-- 
cgit v1.2.3