aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-01-06 10:35:06 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-01-06 11:11:23 -0800
commit6a383f4b481d8ae76acb53e2d2defb2b91288485 (patch)
treeb7e82fb39a7622bffd071d7c7a091170e78c0912 /actionpack
parentd971a1c541545d409e04b613d96b3f8ce774caf1 (diff)
downloadrails-6a383f4b481d8ae76acb53e2d2defb2b91288485.tar.gz
rails-6a383f4b481d8ae76acb53e2d2defb2b91288485.tar.bz2
rails-6a383f4b481d8ae76acb53e2d2defb2b91288485.zip
use assert_includes rather than calling includes? specifically
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/test_case.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index e96ff82a5a..17f978d52e 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -93,7 +93,7 @@ module ActionController
case expected_layout
when String
- assert(@layouts.keys.include?(expected_layout), msg)
+ assert_includes @layouts.keys, expected_layout, msg
when Regexp
assert(@layouts.keys.any? {|l| l =~ expected_layout }, msg)
when nil
@@ -117,7 +117,7 @@ module ActionController
msg = build_message(message,
"expecting partial <?> but action rendered <?>",
options[:partial], @partials.keys)
- assert(@partials.include?(expected_partial), msg)
+ assert_includes @partials, expected_partial, msg
end
else
assert @partials.empty?,