rack 1.6.13 → 2.0.1

data/test/spec_handler.rb

@@ -1,3 +1,4 @@
+require 'minitest/autorun'
 require 'rack/handler'
 
 class Rack::Handler::Lobster; end
@@ -5,66 +6,50 @@ class RockLobster; end
 
 describe Rack::Handler do
   it "has registered default handlers" do
-    Rack::Handler.get('cgi').should.equal Rack::Handler::CGI
-    Rack::Handler.get('webrick').should.equal Rack::Handler::WEBrick
+    Rack::Handler.get('cgi').must_equal Rack::Handler::CGI
+    Rack::Handler.get('webrick').must_equal Rack::Handler::WEBrick
 
     begin
-      Rack::Handler.get('fastcgi').should.equal Rack::Handler::FastCGI
-    rescue LoadError
-    end
-
-    begin
-      Rack::Handler.get('mongrel').should.equal Rack::Handler::Mongrel
+      Rack::Handler.get('fastcgi').must_equal Rack::Handler::FastCGI
     rescue LoadError
     end
   end
 
-  should "raise LoadError if handler doesn't exist" do
+  it "raise LoadError if handler doesn't exist" do
     lambda {
       Rack::Handler.get('boom')
-    }.should.raise(LoadError)
-  end
+    }.must_raise(LoadError)
 
-  should "raise LoadError if handler isn't nested under Rack::Handler" do
-    # Feature-detect whether Ruby can do non-inherited const lookups.
-    # If it can't, then Rack::Handler may lookup non-handler toplevel
-    # constants, so the best we can do is no-op here and not test it.
-    begin
-      Rack::Handler._const_get('Object', false)
-    rescue NameError
-      lambda {
-        Rack::Handler.get('Object')
-      }.should.raise(LoadError)
-    end
+    lambda {
+      Rack::Handler.get('Object')
+    }.must_raise(LoadError)
   end
 
-  should "get unregistered, but already required, handler by name" do
-    Rack::Handler.get('Lobster').should.equal Rack::Handler::Lobster
+  it "get unregistered, but already required, handler by name" do
+    Rack::Handler.get('Lobster').must_equal Rack::Handler::Lobster
   end
 
-  should "register custom handler" do
+  it "register custom handler" do
     Rack::Handler.register('rock_lobster', 'RockLobster')
-    Rack::Handler.get('rock_lobster').should.equal RockLobster
+    Rack::Handler.get('rock_lobster').must_equal RockLobster
   end
 
-  should "not need registration for properly coded handlers even if not already required" do
+  it "not need registration for properly coded handlers even if not already required" do
     begin
       $LOAD_PATH.push File.expand_path('../unregistered_handler', __FILE__)
-      Rack::Handler.get('Unregistered').should.equal Rack::Handler::Unregistered
-      lambda {
-        Rack::Handler.get('UnRegistered')
-      }.should.raise LoadError
-      Rack::Handler.get('UnregisteredLongOne').should.equal Rack::Handler::UnregisteredLongOne
+      Rack::Handler.get('Unregistered').must_equal Rack::Handler::Unregistered
+      lambda { Rack::Handler.get('UnRegistered') }.must_raise LoadError
+      Rack::Handler.get('UnregisteredLongOne').must_equal Rack::Handler::UnregisteredLongOne
     ensure
       $LOAD_PATH.delete File.expand_path('../unregistered_handler', __FILE__)
     end
   end
 
-  should "allow autoloaded handlers to be registered properly while being loaded" do
+  it "allow autoloaded handlers to be registered properly while being loaded" do
     path = File.expand_path('../registering_handler', __FILE__)
     begin
       $LOAD_PATH.push path
-      Rack::Handler.get('registering_myself').should.equal Rack::Handler::RegisteringMyself
+      Rack::Handler.get('registering_myself').must_equal Rack::Handler::RegisteringMyself
     ensure
       $LOAD_PATH.delete path
     end

data/test/spec_head.rb

@@ -1,3 +1,4 @@
+require 'minitest/autorun'
 require 'rack/head'
 require 'rack/lint'
 require 'rack/mock'
@@ -15,31 +16,31 @@ describe Rack::Head do
     return response, body
   end
 
-  should "pass GET, POST, PUT, DELETE, OPTIONS, TRACE requests" do
+  it "pass GET, POST, PUT, DELETE, OPTIONS, TRACE requests" do
     %w[GET POST PUT DELETE OPTIONS TRACE].each do |type|
       resp, _ = test_response("REQUEST_METHOD" => type)
 
-      resp[0].should.equal(200)
-      resp[1].should.equal({"Content-type" => "test/plain", "Content-length" => "3"})
-      resp[2].to_enum.to_a.should.equal(["foo"])
+      resp[0].must_equal 200
+      resp[1].must_equal "Content-type" => "test/plain", "Content-length" => "3"
+      resp[2].to_enum.to_a.must_equal ["foo"]
     end
   end
 
-  should "remove body from HEAD requests" do
+  it "remove body from HEAD requests" do
     resp, _ = test_response("REQUEST_METHOD" => "HEAD")
 
-    resp[0].should.equal(200)
-    resp[1].should.equal({"Content-type" => "test/plain", "Content-length" => "3"})
-    resp[2].to_enum.to_a.should.equal([])
+    resp[0].must_equal 200
+    resp[1].must_equal "Content-type" => "test/plain", "Content-length" => "3"
+    resp[2].to_enum.to_a.must_equal []
   end
 
-  should "close the body when it is removed" do
+  it "close the body when it is removed" do
     resp, body = test_response("REQUEST_METHOD" => "HEAD")
-    resp[0].should.equal(200)
-    resp[1].should.equal({"Content-type" => "test/plain", "Content-length" => "3"})
-    resp[2].to_enum.to_a.should.equal([])
-    body.should.not.be.closed
+    resp[0].must_equal 200
+    resp[1].must_equal "Content-type" => "test/plain", "Content-length" => "3"
+    resp[2].to_enum.to_a.must_equal []
+    body.wont_be :closed?
     resp[2].close
-    body.should.be.closed
+    body.must_be :closed?
   end
 end