Allow global expectation explicitly for minitest.

Global expectations have been deprecated in minitest and will start fail in the upcoming major release. Right now it results in multiple warnings. We need to allow them explicitly. Also fixing spacing style in gemspec.

50 files changed, 51 insertions, 50 deletions

diff --git a/rack.gemspec b/rack.gemspec
index 67ab827a..8ec7acb6 100644
--- a/rack.gemspec
+++ b/rack.gemspec
@@ -28,7 +28,7 @@ EOF
   s.email           = 'leah@vuxu.org'
   s.homepage        = 'https://rack.github.io/'
   s.required_ruby_version = '>= 2.2.2'
-  s.metadata    = {
+  s.metadata = {
     "bug_tracker_uri"   => "https://github.com/rack/rack/issues",
     "changelog_uri"     => "https://github.com/rack/rack/blob/master/CHANGELOG.md",
     "documentation_uri" => "https://rubydoc.info/github/rack/rack",
@@ -39,5 +39,6 @@ EOF
 
   s.add_development_dependency 'minitest', "~> 5.0"
   s.add_development_dependency 'minitest-sprint'
+  s.add_development_dependency 'minitest-global_expectations'
   s.add_development_dependency 'rake'
 end
diff --git a/test/helper.rb b/test/helper.rb
index 9a26e6ac..dff89558 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 
 module Rack
   class TestCase < Minitest::Test
diff --git a/test/spec_auth_basic.rb b/test/spec_auth_basic.rb
index 994a79a7..3e479ace 100644
--- a/test/spec_auth_basic.rb
+++ b/test/spec_auth_basic.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/auth/basic'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_auth_digest.rb b/test/spec_auth_digest.rb
index d60417eb..cc205aa9 100644
--- a/test/spec_auth_digest.rb
+++ b/test/spec_auth_digest.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/auth/digest/md5'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_body_proxy.rb b/test/spec_body_proxy.rb
index 73b194d0..6be79f8b 100644
--- a/test/spec_body_proxy.rb
+++ b/test/spec_body_proxy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/body_proxy'
 require 'stringio'
 
diff --git a/test/spec_builder.rb b/test/spec_builder.rb
index dd529db2..853fb7b1 100644
--- a/test/spec_builder.rb
+++ b/test/spec_builder.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/builder'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_cascade.rb b/test/spec_cascade.rb
index 8061a254..a06aefeb 100644
--- a/test/spec_cascade.rb
+++ b/test/spec_cascade.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack'
 require 'rack/cascade'
 require 'rack/file'
diff --git a/test/spec_chunked.rb b/test/spec_chunked.rb
index 26c5c37f..daa36cad 100644
--- a/test/spec_chunked.rb
+++ b/test/spec_chunked.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/chunked'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_common_logger.rb b/test/spec_common_logger.rb
index 0aa2a048..330a6480 100644
--- a/test/spec_common_logger.rb
+++ b/test/spec_common_logger.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/common_logger'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_conditional_get.rb b/test/spec_conditional_get.rb
index a6a33df1..8402f04e 100644
--- a/test/spec_conditional_get.rb
+++ b/test/spec_conditional_get.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'time'
 require 'rack/conditional_get'
 require 'rack/mock'
diff --git a/test/spec_config.rb b/test/spec_config.rb
index d5f7ceca..d97107b6 100644
--- a/test/spec_config.rb
+++ b/test/spec_config.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/builder'
 require 'rack/config'
 require 'rack/content_length'
diff --git a/test/spec_content_length.rb b/test/spec_content_length.rb
index 8856e7d3..2e7a8581 100644
--- a/test/spec_content_length.rb
+++ b/test/spec_content_length.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/content_length'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_content_type.rb b/test/spec_content_type.rb
index a46f95ea..53f1d172 100644
--- a/test/spec_content_type.rb
+++ b/test/spec_content_type.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/content_type'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_deflater.rb b/test/spec_deflater.rb
index 18fe831b..75244dcc 100644
--- a/test/spec_deflater.rb
+++ b/test/spec_deflater.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'stringio'
 require 'time'  # for Time#httpdate
 require 'rack/deflater'
diff --git a/test/spec_directory.rb b/test/spec_directory.rb
index 1187471c..8635ec90 100644
--- a/test/spec_directory.rb
+++ b/test/spec_directory.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/directory'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_etag.rb b/test/spec_etag.rb
index 5e13d538..750ceaac 100644
--- a/test/spec_etag.rb
+++ b/test/spec_etag.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/etag'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_file.rb b/test/spec_file.rb
index 55b6eaad..ba713c61 100644
--- a/test/spec_file.rb
+++ b/test/spec_file.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/file'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_handler.rb b/test/spec_handler.rb
index c38cf4e9..5746dc22 100644
--- a/test/spec_handler.rb
+++ b/test/spec_handler.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/handler'
 
 class Rack::Handler::Lobster; end
diff --git a/test/spec_head.rb b/test/spec_head.rb
index 1cf8b391..f6f41a5d 100644
--- a/test/spec_head.rb
+++ b/test/spec_head.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/head'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_lint.rb b/test/spec_lint.rb
index 07f7fe2b..192f260f 100644
--- a/test/spec_lint.rb
+++ b/test/spec_lint.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'stringio'
 require 'tempfile'
 require 'rack/lint'
diff --git a/test/spec_lobster.rb b/test/spec_lobster.rb
index d4fcff47..9f3b9a89 100644
--- a/test/spec_lobster.rb
+++ b/test/spec_lobster.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/lobster'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_lock.rb b/test/spec_lock.rb
index 25d71fc6..cd9e1230 100644
--- a/test/spec_lock.rb
+++ b/test/spec_lock.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/lint'
 require 'rack/lock'
 require 'rack/mock'
diff --git a/test/spec_logger.rb b/test/spec_logger.rb
index d6876c5f..f453b14d 100644
--- a/test/spec_logger.rb
+++ b/test/spec_logger.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'stringio'
 require 'rack/lint'
 require 'rack/logger'
diff --git a/test/spec_media_type.rb b/test/spec_media_type.rb
index 580d24ce..7d52b4d4 100644
--- a/test/spec_media_type.rb
+++ b/test/spec_media_type.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/media_type'
 
 describe Rack::MediaType do
diff --git a/test/spec_method_override.rb b/test/spec_method_override.rb
index 00990f9b..6b01f7c9 100644
--- a/test/spec_method_override.rb
+++ b/test/spec_method_override.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'stringio'
 require 'rack/method_override'
 require 'rack/mock'
diff --git a/test/spec_mime.rb b/test/spec_mime.rb
index b9258eb6..8d1ca256 100644
--- a/test/spec_mime.rb
+++ b/test/spec_mime.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/mime'
 
 describe Rack::Mime do
diff --git a/test/spec_mock.rb b/test/spec_mock.rb
index 4c5e1b7c..d7246d3f 100644
--- a/test/spec_mock.rb
+++ b/test/spec_mock.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'yaml'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_multipart.rb b/test/spec_multipart.rb
index 67888dc0..b029048e 100644
--- a/test/spec_multipart.rb
+++ b/test/spec_multipart.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack'
 require 'rack/multipart'
 require 'rack/multipart/parser'
diff --git a/test/spec_null_logger.rb b/test/spec_null_logger.rb
index f15d47a9..1037c9fa 100644
--- a/test/spec_null_logger.rb
+++ b/test/spec_null_logger.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/lint'
 require 'rack/mock'
 require 'rack/null_logger'
diff --git a/test/spec_recursive.rb b/test/spec_recursive.rb
index be1e97e6..e77d966d 100644
--- a/test/spec_recursive.rb
+++ b/test/spec_recursive.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/lint'
 require 'rack/recursive'
 require 'rack/mock'
diff --git a/test/spec_request.rb b/test/spec_request.rb
index 4dd30707..583a367e 100644
--- a/test/spec_request.rb
+++ b/test/spec_request.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'stringio'
 require 'cgi'
 require 'rack/request'
diff --git a/test/spec_response.rb b/test/spec_response.rb
index 68c0953c..3cd56664 100644
--- a/test/spec_response.rb
+++ b/test/spec_response.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack'
 require 'rack/response'
 require 'stringio'
diff --git a/test/spec_rewindable_input.rb b/test/spec_rewindable_input.rb
index 932e9de3..6bb5f5cf 100644
--- a/test/spec_rewindable_input.rb
+++ b/test/spec_rewindable_input.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'stringio'
 require 'rack/rewindable_input'
 
diff --git a/test/spec_runtime.rb b/test/spec_runtime.rb
index 5a7e84bd..10e561de 100644
--- a/test/spec_runtime.rb
+++ b/test/spec_runtime.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/lint'
 require 'rack/mock'
 require 'rack/runtime'
diff --git a/test/spec_sendfile.rb b/test/spec_sendfile.rb
index 8688df9f..cbed8db3 100644
--- a/test/spec_sendfile.rb
+++ b/test/spec_sendfile.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'fileutils'
 require 'rack/lint'
 require 'rack/sendfile'
diff --git a/test/spec_server.rb b/test/spec_server.rb
index 3ec88f16..b09caf03 100644
--- a/test/spec_server.rb
+++ b/test/spec_server.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack'
 require 'rack/server'
 require 'tempfile'
diff --git a/test/spec_session_abstract_id.rb b/test/spec_session_abstract_id.rb
index 00140c16..3591a3de 100644
--- a/test/spec_session_abstract_id.rb
+++ b/test/spec_session_abstract_id.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 ### WARNING: there be hax in this file.
 
 require 'rack/session/abstract/id'
diff --git a/test/spec_session_abstract_session_hash.rb b/test/spec_session_abstract_session_hash.rb
index 37030a8c..206e2c1b 100644
--- a/test/spec_session_abstract_session_hash.rb
+++ b/test/spec_session_abstract_session_hash.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/session/abstract/id'
 
 describe Rack::Session::Abstract::SessionHash do
diff --git a/test/spec_session_cookie.rb b/test/spec_session_cookie.rb
index 8ecfde53..9b4442dd 100644
--- a/test/spec_session_cookie.rb
+++ b/test/spec_session_cookie.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/session/cookie'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_session_memcache.rb b/test/spec_session_memcache.rb
index da90b340..a015cee6 100644
--- a/test/spec_session_memcache.rb
+++ b/test/spec_session_memcache.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 begin
   require 'rack/session/memcache'
   require 'rack/lint'
diff --git a/test/spec_session_pool.rb b/test/spec_session_pool.rb
index 6eecce36..fda5f56e 100644
--- a/test/spec_session_pool.rb
+++ b/test/spec_session_pool.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'thread'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_show_exceptions.rb b/test/spec_show_exceptions.rb
index 9cad32ce..a4ade121 100644
--- a/test/spec_show_exceptions.rb
+++ b/test/spec_show_exceptions.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/show_exceptions'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_show_status.rb b/test/spec_show_status.rb
index a4b58e2a..ca23134e 100644
--- a/test/spec_show_status.rb
+++ b/test/spec_show_status.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/show_status'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_static.rb b/test/spec_static.rb
index 7c510bf6..d33e8edc 100644
--- a/test/spec_static.rb
+++ b/test/spec_static.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/static'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_tempfile_reaper.rb b/test/spec_tempfile_reaper.rb
index f6b79641..0e7de841 100644
--- a/test/spec_tempfile_reaper.rb
+++ b/test/spec_tempfile_reaper.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/tempfile_reaper'
 require 'rack/lint'
 require 'rack/mock'
diff --git a/test/spec_thin.rb b/test/spec_thin.rb
index cc4967b2..0729c3f3 100644
--- a/test/spec_thin.rb
+++ b/test/spec_thin.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 begin
 require 'rack/handler/thin'
 require File.expand_path('../testrequest', __FILE__)
diff --git a/test/spec_urlmap.rb b/test/spec_urlmap.rb
index f5d7e115..9ce38298 100644
--- a/test/spec_urlmap.rb
+++ b/test/spec_urlmap.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/urlmap'
 require 'rack/mock'
 
diff --git a/test/spec_utils.rb b/test/spec_utils.rb
index 2089ee2c..6210fd73 100644
--- a/test/spec_utils.rb
+++ b/test/spec_utils.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/utils'
 require 'rack/mock'
 require 'timeout'
diff --git a/test/spec_version.rb b/test/spec_version.rb
index 04604ebf..d4191aa4 100644
--- a/test/spec_version.rb
+++ b/test/spec_version.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack'
 
 describe Rack do
diff --git a/test/spec_webrick.rb b/test/spec_webrick.rb
index cabb2e4a..0d0aa8f7 100644
--- a/test/spec_webrick.rb
+++ b/test/spec_webrick.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'rack/mock'
 require 'thread'
 require File.expand_path('../testrequest', __FILE__)