diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-26 19:43:14 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-26 19:43:14 -0700 |
| commit | 75d0a81ffe48030bb8d6fa79f70f5b368f748b7c (patch) | |
| tree | c729412e462367179ced0c7fd2e6b92eee9d6e41 /actionpack | |
| parent | df37c91745a3fb241fafa23c03387e33eb82c74f (diff) | |
| parent | dee5915aac009b6b6456a81ae7b8927866d0c240 (diff) | |
| download | rails-75d0a81ffe48030bb8d6fa79f70f5b368f748b7c.tar.gz rails-75d0a81ffe48030bb8d6fa79f70f5b368f748b7c.tar.bz2 rails-75d0a81ffe48030bb8d6fa79f70f5b368f748b7c.zip | |
Merge pull request #9943 from fredwu/test_fix_for_74e59ea
Fixed test failures on 1.8.7 caused by 74e59ea
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |