From e7440de279fdf1ae50ee4171f678b7af46d48fcd Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 26 Jul 2016 13:02:33 +0000 Subject: [PATCH] test: use assert_include git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55757 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/cgi/test_cgi_header.rb | 2 +- test/openssl/test_pair.rb | 4 ++-- test/ruby/test_time_tz.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cgi/test_cgi_header.rb b/test/cgi/test_cgi_header.rb index b1a0b41856..c420e7978b 100644 --- a/test/cgi/test_cgi_header.rb +++ b/test/cgi/test_cgi_header.rb @@ -147,7 +147,7 @@ class CGIHeaderTest < Test::Unit::TestCase date = /^Date: ([A-Z][a-z]{2}, \d{2} [A-Z][a-z]{2} \d{4} \d\d:\d\d:\d\d GMT)\r\n/ [actual1, actual2, actual3].each do |actual| assert_match(date, actual) - assert_includes(time_start..time_end, date =~ actual && Time.parse($1).to_i) + assert_include(time_start..time_end, date =~ actual && Time.parse($1).to_i) actual.sub!(date, "Date: DATE_IS_REMOVED\r\n") end ## assertion diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb index b90b4de372..5750f3b7df 100644 --- a/test/openssl/test_pair.rb +++ b/test/openssl/test_pair.rb @@ -497,13 +497,13 @@ module OpenSSL::TestPairM until th.join(0.01) accepted = s2.accept_nonblock(exception: false) - assert_includes([s2, :wait_readable, :wait_writable ], accepted) + assert_include([s2, :wait_readable, :wait_writable ], accepted) end rets = th.value assert_instance_of Array, rets rets.each do |rv| - assert_includes([s1, :wait_readable, :wait_writable ], rv) + assert_include([s1, :wait_readable, :wait_writable ], rv) end ensure th.join if th diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb index b40b1aca91..20a57fe7dd 100644 --- a/test/ruby/test_time_tz.rb +++ b/test/ruby/test_time_tz.rb @@ -390,7 +390,7 @@ End ] } } - assert_includes(results, [true, true, true, true, true]) + assert_include(results, [true, true, true, true, true]) } end