Permalink
Browse files

Merge pull request #9943 from fredwu/test_fix_for_74e59ea

Fixed test failures on 1.8.7 caused by 74e59ea
  • Loading branch information...
2 parents df37c91 + dee5915 commit 75d0a81ffe48030bb8d6fa79f70f5b368f748b7c @carlosantoniodasilva carlosantoniodasilva committed Mar 27, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/lib/action_controller/test_case.rb
@@ -110,7 +110,7 @@ def assert_template(options = {}, message = nil)
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

0 comments on commit 75d0a81

Please sign in to comment.