rack 1.6.13 → 2.0.0.alpha

data/test/{spec_nulllogger.rb → spec_null_logger.rb}

@@ -1,9 +1,10 @@
+require 'minitest/autorun'
 require 'rack/lint'
 require 'rack/mock'
-require 'rack/nulllogger'
+require 'rack/null_logger'
 
 describe Rack::NullLogger do
-  should "act as a noop logger" do
+  it "act as a noop logger" do
     app = lambda { |env|
       env['rack.logger'].warn "b00m"
       [200, {'Content-Type' => 'text/plain'}, ["Hello, World!"]]
@@ -12,9 +13,9 @@ describe Rack::NullLogger do
     logger = Rack::Lint.new(Rack::NullLogger.new(app))
 
     res = logger.call(Rack::MockRequest.env_for)
-    res[0..1].should.equal [
+    res[0..1].must_equal [
       200, {'Content-Type' => 'text/plain'}
     ]
-    res[2].to_enum.to_a.should.equal ["Hello, World!"]
+    res[2].to_enum.to_a.must_equal ["Hello, World!"]
   end
 end

data/test/spec_recursive.rb

@@ -1,8 +1,10 @@
+require 'minitest/autorun'
 require 'rack/lint'
 require 'rack/recursive'
 require 'rack/mock'
 
 describe Rack::Recursive do
+  before do
   @app1 = lambda { |env|
     res = Rack::Response.new
     res["X-Path-Info"] = env["PATH_INFO"]
@@ -29,44 +31,45 @@ describe Rack::Recursive do
   @app4 = lambda { |env|
     raise Rack::ForwardRequest.new("http://example.org/app1/quux?meh")
   }
-  
+  end
+
   def recursive(map)
     Rack::Lint.new Rack::Recursive.new(Rack::URLMap.new(map))
   end
 
-  should "allow for subrequests" do
+  it "allow for subrequests" do
     res = Rack::MockRequest.new(recursive("/app1" => @app1,
                                           "/app2" => @app2)).
       get("/app2")
 
-    res.should.be.ok
-    res.body.should.equal "App2App1"
+    res.must_be :ok?
+    res.body.must_equal "App2App1"
   end
 
-  should "raise error on requests not below the app" do
+  it "raise error on requests not below the app" do
     app = Rack::URLMap.new("/app1" => @app1,
                            "/app" => recursive("/1" => @app1,
                                                "/2" => @app2))
 
     lambda {
       Rack::MockRequest.new(app).get("/app/2")
-    }.should.raise(ArgumentError).
-      message.should =~ /can only include below/
+    }.must_raise(ArgumentError).
+      message.must_match(/can only include below/)
   end
 
-  should "support forwarding" do
+  it "support forwarding" do
     app = recursive("/app1" => @app1,
                     "/app3" => @app3,
                     "/app4" => @app4)
 
     res = Rack::MockRequest.new(app).get("/app3")
-    res.should.be.ok
-    res.body.should.equal "App1"
+    res.must_be :ok?
+    res.body.must_equal "App1"
 
     res = Rack::MockRequest.new(app).get("/app4")
-    res.should.be.ok
-    res.body.should.equal "App1"
-    res["X-Path-Info"].should.equal "/quux"
-    res["X-Query-String"].should.equal "meh"
+    res.must_be :ok?
+    res.body.must_equal "App1"
+    res["X-Path-Info"].must_equal "/quux"
+    res["X-Query-String"].must_equal "meh"
   end
 end

data/test/spec_request.rb

@@ -1,574 +1,719 @@
+require 'minitest/autorun'
 require 'stringio'
 require 'cgi'
 require 'rack/request'
 require 'rack/mock'
+require 'rack/multipart'
 require 'securerandom'
 
-describe Rack::Request do
-  should "wrap the rack variables" do
-    req = Rack::Request.new(Rack::MockRequest.env_for("http://example.com:8080/"))
+class RackRequestTest < Minitest::Spec
+  it "copies the env when duping" do
+    req = make_request(Rack::MockRequest.env_for("http://example.com:8080/"))
+    refute_same req.env, req.dup.env
+  end
+
+  it 'can check if something has been set' do
+    req = make_request(Rack::MockRequest.env_for("http://example.com:8080/"))
+    refute req.has_header?("FOO")
+  end
+
+  it "can get a key from the env" do
+    req = make_request(Rack::MockRequest.env_for("http://example.com:8080/"))
+    assert_equal "example.com", req.get_header("SERVER_NAME")
+  end
+
+  it 'can calculate the authority' do
+    req = make_request(Rack::MockRequest.env_for("http://example.com:8080/"))
+    assert_equal "example.com:8080", req.authority
+  end
+
+  it 'can calculate the authority without a port' do
+    req = make_request(Rack::MockRequest.env_for("http://example.com/"))
+    assert_equal "example.com:80", req.authority
+  end
+
+  it 'can calculate the authority without a port on ssl' do
+    req = make_request(Rack::MockRequest.env_for("https://example.com/"))
+    assert_equal "example.com:443", req.authority
+  end
+
+  it 'yields to the block if no value has been set' do
+    req = make_request(Rack::MockRequest.env_for("http://example.com:8080/"))
+    yielded = false
+    req.fetch_header("FOO") do
+      yielded = true
+      req.set_header "FOO", 'bar'
+    end
+
+    assert yielded
+    assert_equal "bar", req.get_header("FOO")
+  end
 
-    req.body.should.respond_to? :gets
-    req.scheme.should.equal "http"
-    req.request_method.should.equal "GET"
+  it 'can iterate over values' do
+    req = make_request(Rack::MockRequest.env_for("http://example.com:8080/"))
+    req.set_header 'foo', 'bar'
+    hash = {}
+    req.each_header do |k,v|
+      hash[k] = v
+    end
+    assert_equal 'bar', hash['foo']
+  end
+
+  it 'can set values in the env' do
+    req = make_request(Rack::MockRequest.env_for("http://example.com:8080/"))
+    req.set_header("FOO", "BAR")
+    assert_equal "BAR", req.get_header("FOO")
+  end
 
-    req.should.be.get
-    req.should.not.be.post
-    req.should.not.be.put
-    req.should.not.be.delete
-    req.should.not.be.head
-    req.should.not.be.patch
+  it 'can add to multivalued headers in the env' do
+    req = make_request(Rack::MockRequest.env_for('http://example.com:8080/'))
 
-    req.script_name.should.equal ""
-    req.path_info.should.equal "/"
-    req.query_string.should.equal ""
+    assert_equal '1', req.add_header('FOO', '1')
+    assert_equal '1', req.get_header('FOO')
 
-    req.host.should.equal "example.com"
-    req.port.should.equal 8080
+    assert_equal '1,2', req.add_header('FOO', '2')
+    assert_equal '1,2', req.get_header('FOO')
 
-    req.content_length.should.equal "0"
-    req.content_type.should.be.nil
+    assert_equal '1,2', req.add_header('FOO', nil)
+    assert_equal '1,2', req.get_header('FOO')
   end
 
-  should "figure out the correct host" do
-    req = Rack::Request.new \
+  it 'can delete env values' do
+    req = make_request(Rack::MockRequest.env_for("http://example.com:8080/"))
+    req.set_header 'foo', 'bar'
+    assert req.has_header? 'foo'
+    req.delete_header 'foo'
+    refute req.has_header? 'foo'
+  end
+
+  it "wrap the rack variables" do
+    req = make_request(Rack::MockRequest.env_for("http://example.com:8080/"))
+
+    req.body.must_respond_to :gets
+    req.scheme.must_equal "http"
+    req.request_method.must_equal "GET"
+
+    req.must_be :get?
+    req.wont_be :post?
+    req.wont_be :put?
+    req.wont_be :delete?
+    req.wont_be :head?
+    req.wont_be :patch?
+
+    req.script_name.must_equal ""
+    req.path_info.must_equal "/"
+    req.query_string.must_equal ""
+
+    req.host.must_equal "example.com"
+    req.port.must_equal 8080
+
+    req.content_length.must_equal "0"
+    req.content_type.must_be_nil
+  end
+
+  it "figure out the correct host" do
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "www2.example.org")
-    req.host.should.equal "www2.example.org"
+    req.host.must_equal "www2.example.org"
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "SERVER_NAME" => "example.org", "SERVER_PORT" => "9292")
-    req.host.should.equal "example.org"
+    req.host.must_equal "example.org"
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "localhost:81", "HTTP_X_FORWARDED_HOST" => "example.org:9292")
-    req.host.should.equal "example.org"
+    req.host.must_equal "example.org"
 
     env = Rack::MockRequest.env_for("/", "SERVER_ADDR" => "192.168.1.1", "SERVER_PORT" => "9292")
     env.delete("SERVER_NAME")
-    req = Rack::Request.new(env)
-    req.host.should.equal "192.168.1.1"
+    req = make_request(env)
+    req.host.must_equal "192.168.1.1"
 
     env = Rack::MockRequest.env_for("/")
     env.delete("SERVER_NAME")
-    req = Rack::Request.new(env)
-    req.host.should.equal ""
+    req = make_request(env)
+    req.host.must_equal ""
   end
 
-  should "figure out the correct port" do
-    req = Rack::Request.new \
+  it "figure out the correct port" do
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "www2.example.org")
-    req.port.should.equal 80
+    req.port.must_equal 80
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "www2.example.org:81")
-    req.port.should.equal 81
+    req.port.must_equal 81
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "SERVER_NAME" => "example.org", "SERVER_PORT" => "9292")
-    req.port.should.equal 9292
+    req.port.must_equal 9292
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "localhost:81", "HTTP_X_FORWARDED_HOST" => "example.org:9292")
-    req.port.should.equal 9292
+    req.port.must_equal 9292
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "localhost:81", "HTTP_X_FORWARDED_HOST" => "example.org")
-    req.port.should.equal 80
+    req.port.must_equal 80
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "localhost:81", "HTTP_X_FORWARDED_HOST" => "example.org", "HTTP_X_FORWARDED_SSL" => "on")
-    req.port.should.equal 443
+    req.port.must_equal 443
 
-     req = Rack::Request.new \
+     req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "localhost:81", "HTTP_X_FORWARDED_HOST" => "example.org", "HTTP_X_FORWARDED_PROTO" => "https")
-    req.port.should.equal 443
+    req.port.must_equal 443
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "localhost:81", "HTTP_X_FORWARDED_HOST" => "example.org", "HTTP_X_FORWARDED_PORT" => "9393")
-    req.port.should.equal 9393
+    req.port.must_equal 9393
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "localhost:81", "HTTP_X_FORWARDED_HOST" => "example.org:9393", "SERVER_PORT" => "80")
-    req.port.should.equal 9393
+    req.port.must_equal 9393
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "localhost:81", "HTTP_X_FORWARDED_HOST" => "example.org", "SERVER_PORT" => "9393")
-    req.port.should.equal 80
+    req.port.must_equal 80
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "localhost", "HTTP_X_FORWARDED_PROTO" => "https", "SERVER_PORT" => "80")
-    req.port.should.equal 443
+    req.port.must_equal 443
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "localhost", "HTTP_X_FORWARDED_PROTO" => "https,https", "SERVER_PORT" => "80")
-    req.port.should.equal 443
+    req.port.must_equal 443
   end
 
-  should "figure out the correct host with port" do
-    req = Rack::Request.new \
+  it "figure out the correct host with port" do
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "www2.example.org")
-    req.host_with_port.should.equal "www2.example.org"
+    req.host_with_port.must_equal "www2.example.org"
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "localhost:81")
-    req.host_with_port.should.equal "localhost:81"
+    req.host_with_port.must_equal "localhost:81"
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "SERVER_NAME" => "example.org", "SERVER_PORT" => "9292")
-    req.host_with_port.should.equal "example.org:9292"
+    req.host_with_port.must_equal "example.org:9292"
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "localhost:81", "HTTP_X_FORWARDED_HOST" => "example.org:9292")
-    req.host_with_port.should.equal "example.org:9292"
+    req.host_with_port.must_equal "example.org:9292"
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_HOST" => "localhost:81", "HTTP_X_FORWARDED_HOST" => "example.org", "SERVER_PORT" => "9393")
-    req.host_with_port.should.equal "example.org"
+    req.host_with_port.must_equal "example.org"
   end
 
-  should "parse the query string" do
-    req = Rack::Request.new(Rack::MockRequest.env_for("/?foo=bar&quux=bla"))
-    req.query_string.should.equal "foo=bar&quux=bla"
-    req.GET.should.equal "foo" => "bar", "quux" => "bla"
-    req.POST.should.be.empty
-    req.params.should.equal "foo" => "bar", "quux" => "bla"
+  it "parse the query string" do
+    req = make_request(Rack::MockRequest.env_for("/?foo=bar&quux=bla"))
+    req.query_string.must_equal "foo=bar&quux=bla"
+    req.GET.must_equal "foo" => "bar", "quux" => "bla"
+    req.POST.must_be :empty?
+    req.params.must_equal "foo" => "bar", "quux" => "bla"
   end
 
-  should "not truncate query strings containing semi-colons #543 only in POST" do
+  it "not truncate query strings containing semi-colons #543 only in POST" do
     mr = Rack::MockRequest.env_for("/",
       "REQUEST_METHOD" => 'POST',
       :input => "foo=bar&quux=b;la")
-    req = Rack::Request.new mr
-    req.query_string.should.equal ""
-    req.GET.should.be.empty
-    req.POST.should.equal "foo" => "bar", "quux" => "b;la"
-    req.params.should.equal req.GET.merge(req.POST)
+    req = make_request mr
+    req.query_string.must_equal ""
+    req.GET.must_be :empty?
+    req.POST.must_equal "foo" => "bar", "quux" => "b;la"
+    req.params.must_equal req.GET.merge(req.POST)
+  end
+
+  it "should use the query_parser for query parsing" do
+    c = Class.new(Rack::QueryParser::Params) do
+      def initialize(*)
+        super
+        @params = Hash.new{|h,k| h[k.to_s] if k.is_a?(Symbol)}
+      end
+    end
+    parser = Rack::QueryParser.new(c, 65536, 100)
+    c = Class.new(Rack::Request) do
+      define_method(:query_parser) do
+        parser
+      end
+    end
+    req = c.new(Rack::MockRequest.env_for("/?foo=bar&quux=bla"))
+    req.GET[:foo].must_equal "bar"
+    req.GET[:quux].must_equal "bla"
+    req.params[:foo].must_equal "bar"
+    req.params[:quux].must_equal "bla"
   end
 
-  should "use semi-colons as separators for query strings in GET" do
-    req = Rack::Request.new(Rack::MockRequest.env_for("/?foo=bar&quux=b;la;wun=duh"))
-    req.query_string.should.equal "foo=bar&quux=b;la;wun=duh"
-    req.GET.should.equal "foo" => "bar", "quux" => "b", "la" => nil, "wun" => "duh"
-    req.POST.should.be.empty
-    req.params.should.equal "foo" => "bar", "quux" => "b", "la" => nil, "wun" => "duh"
+  it "use semi-colons as separators for query strings in GET" do
+    req = make_request(Rack::MockRequest.env_for("/?foo=bar&quux=b;la;wun=duh"))
+    req.query_string.must_equal "foo=bar&quux=b;la;wun=duh"
+    req.GET.must_equal "foo" => "bar", "quux" => "b", "la" => nil, "wun" => "duh"
+    req.POST.must_be :empty?
+    req.params.must_equal "foo" => "bar", "quux" => "b", "la" => nil, "wun" => "duh"
   end
 
-  should "limit the keys from the GET query string" do
+  it "limit the keys from the GET query string" do
     env = Rack::MockRequest.env_for("/?foo=bar")
 
     old, Rack::Utils.key_space_limit = Rack::Utils.key_space_limit, 1
     begin
-      req = Rack::Request.new(env)
-      lambda { req.GET }.should.raise(RangeError)
+      req = make_request(env)
+      lambda { req.GET }.must_raise RangeError
     ensure
       Rack::Utils.key_space_limit = old
     end
   end
 
-  should "limit the key size per nested params hash" do
+  it "limit the key size per nested params hash" do
     nested_query = Rack::MockRequest.env_for("/?foo%5Bbar%5D%5Bbaz%5D%5Bqux%5D=1")
     plain_query  = Rack::MockRequest.env_for("/?foo_bar__baz__qux_=1")
 
     old, Rack::Utils.key_space_limit = Rack::Utils.key_space_limit, 3
     begin
-      lambda { Rack::Request.new(nested_query).GET }.should.not.raise(RangeError)
-      lambda { Rack::Request.new(plain_query).GET  }.should.raise(RangeError)
+      exp = {"foo"=>{"bar"=>{"baz"=>{"qux"=>"1"}}}}
+      make_request(nested_query).GET.must_equal exp
+      lambda { make_request(plain_query).GET  }.must_raise RangeError
     ensure
       Rack::Utils.key_space_limit = old
     end
   end
 
-  should "not unify GET and POST when calling params" do
+  it "not unify GET and POST when calling params" do
+    mr = Rack::MockRequest.env_for("/?foo=quux",
+      "REQUEST_METHOD" => 'POST',
+      :input => "foo=bar&quux=bla"
+    )
+    req = make_request mr
+
+    req.params
+
+    req.GET.must_equal "foo" => "quux"
+    req.POST.must_equal "foo" => "bar", "quux" => "bla"
+    req.params.must_equal req.GET.merge(req.POST)
+  end
+
+  it "use the query_parser's params_class for multipart params" do
+    c = Class.new(Rack::QueryParser::Params) do
+      def initialize(*)
+        super
+        @params = Hash.new{|h,k| h[k.to_s] if k.is_a?(Symbol)}
+      end
+    end
+    parser = Rack::QueryParser.new(c, 65536, 100)
+    c = Class.new(Rack::Request) do
+      define_method(:query_parser) do
+        parser
+      end
+    end
     mr = Rack::MockRequest.env_for("/?foo=quux",
       "REQUEST_METHOD" => 'POST',
       :input => "foo=bar&quux=bla"
     )
-    req = Rack::Request.new mr
+    req = c.new mr
 
     req.params
 
-    req.GET.should.equal "foo" => "quux"
-    req.POST.should.equal "foo" => "bar", "quux" => "bla"
-    req.params.should.equal req.GET.merge(req.POST)
+    req.GET[:foo].must_equal "quux"
+    req.POST[:foo].must_equal "bar"
+    req.POST[:quux].must_equal "bla"
+    req.params[:foo].must_equal "bar"
+    req.params[:quux].must_equal "bla"
   end
 
-  should "raise if input params has invalid %-encoding" do
+  it "raise if input params has invalid %-encoding" do
     mr = Rack::MockRequest.env_for("/?foo=quux",
       "REQUEST_METHOD" => 'POST',
       :input => "a%=1"
     )
-    req = Rack::Request.new mr
+    req = make_request mr
 
-    lambda { req.POST }.
-      should.raise(Rack::Utils::InvalidParameterError).
-      message.should.equal "invalid %-encoding (a%)"
+    lambda { req.POST }.must_raise(Rack::Utils::InvalidParameterError).
+      message.must_equal "invalid %-encoding (a%)"
   end
 
-  should "raise if rack.input is missing" do
-    req = Rack::Request.new({})
-    lambda { req.POST }.should.raise(RuntimeError)
+  it "raise if rack.input is missing" do
+    req = make_request({})
+    lambda { req.POST }.must_raise RuntimeError
   end
 
-  should "parse POST data when method is POST and no Content-Type given" do
-    req = Rack::Request.new \
+  it "parse POST data when method is POST and no Content-Type given" do
+    req = make_request \
       Rack::MockRequest.env_for("/?foo=quux",
         "REQUEST_METHOD" => 'POST',
         :input => "foo=bar&quux=bla")
-    req.content_type.should.be.nil
-    req.media_type.should.be.nil
-    req.query_string.should.equal "foo=quux"
-    req.GET.should.equal "foo" => "quux"
-    req.POST.should.equal "foo" => "bar", "quux" => "bla"
-    req.params.should.equal "foo" => "bar", "quux" => "bla"
+    req.content_type.must_be_nil
+    req.media_type.must_be_nil
+    req.query_string.must_equal "foo=quux"
+    req.GET.must_equal "foo" => "quux"
+    req.POST.must_equal "foo" => "bar", "quux" => "bla"
+    req.params.must_equal "foo" => "bar", "quux" => "bla"
   end
 
-  should "limit the keys from the POST form data" do
+  it "limit the keys from the POST form data" do
     env = Rack::MockRequest.env_for("",
             "REQUEST_METHOD" => 'POST',
             :input => "foo=bar&quux=bla")
 
     old, Rack::Utils.key_space_limit = Rack::Utils.key_space_limit, 1
     begin
-      req = Rack::Request.new(env)
-      lambda { req.POST }.should.raise(RangeError)
+      req = make_request(env)
+      lambda { req.POST }.must_raise RangeError
     ensure
       Rack::Utils.key_space_limit = old
     end
   end
 
-  should "parse POST data with explicit content type regardless of method" do
-    req = Rack::Request.new \
+  it "parse POST data with explicit content type regardless of method" do
+    req = make_request \
       Rack::MockRequest.env_for("/",
         "CONTENT_TYPE" => 'application/x-www-form-urlencoded;foo=bar',
         :input => "foo=bar&quux=bla")
-    req.content_type.should.equal 'application/x-www-form-urlencoded;foo=bar'
-    req.media_type.should.equal 'application/x-www-form-urlencoded'
-    req.media_type_params['foo'].should.equal 'bar'
-    req.POST.should.equal "foo" => "bar", "quux" => "bla"
-    req.params.should.equal "foo" => "bar", "quux" => "bla"
+    req.content_type.must_equal 'application/x-www-form-urlencoded;foo=bar'
+    req.media_type.must_equal 'application/x-www-form-urlencoded'
+    req.media_type_params['foo'].must_equal 'bar'
+    req.POST.must_equal "foo" => "bar", "quux" => "bla"
+    req.params.must_equal "foo" => "bar", "quux" => "bla"
   end
 
-  should "not parse POST data when media type is not form-data" do
-    req = Rack::Request.new \
+  it "not parse POST data when media type is not form-data" do
+    req = make_request \
       Rack::MockRequest.env_for("/?foo=quux",
         "REQUEST_METHOD" => 'POST',
         "CONTENT_TYPE" => 'text/plain;charset=utf-8',
         :input => "foo=bar&quux=bla")
-    req.content_type.should.equal 'text/plain;charset=utf-8'
-    req.media_type.should.equal 'text/plain'
-    req.media_type_params['charset'].should.equal 'utf-8'
-    req.POST.should.be.empty
-    req.params.should.equal "foo" => "quux"
-    req.body.read.should.equal "foo=bar&quux=bla"
+    req.content_type.must_equal 'text/plain;charset=utf-8'
+    req.media_type.must_equal 'text/plain'
+    req.media_type_params['charset'].must_equal 'utf-8'
+    req.POST.must_be :empty?
+    req.params.must_equal "foo" => "quux"
+    req.body.read.must_equal "foo=bar&quux=bla"
   end
 
-  should "parse POST data on PUT when media type is form-data" do
-    req = Rack::Request.new \
+  it "parse POST data on PUT when media type is form-data" do
+    req = make_request \
       Rack::MockRequest.env_for("/?foo=quux",
         "REQUEST_METHOD" => 'PUT',
         "CONTENT_TYPE" => 'application/x-www-form-urlencoded',
         :input => "foo=bar&quux=bla")
-    req.POST.should.equal "foo" => "bar", "quux" => "bla"
-    req.body.read.should.equal "foo=bar&quux=bla"
+    req.POST.must_equal "foo" => "bar", "quux" => "bla"
+    req.body.read.must_equal "foo=bar&quux=bla"
   end
 
-  should "rewind input after parsing POST data" do
+  it "rewind input after parsing POST data" do
     input = StringIO.new("foo=bar&quux=bla")
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/",
         "CONTENT_TYPE" => 'application/x-www-form-urlencoded;foo=bar',
         :input => input)
-    req.params.should.equal "foo" => "bar", "quux" => "bla"
-    input.read.should.equal "foo=bar&quux=bla"
+    req.params.must_equal "foo" => "bar", "quux" => "bla"
+    input.read.must_equal "foo=bar&quux=bla"
   end
 
-  should "clean up Safari's ajax POST body" do
-    req = Rack::Request.new \
+  it "safely accepts POST requests with empty body" do
+    mr = Rack::MockRequest.env_for("/",
+      "REQUEST_METHOD" => "POST",
+      "CONTENT_TYPE"   => "multipart/form-data, boundary=AaB03x",
+      "CONTENT_LENGTH" => '0',
+      :input => nil)
+
+    req = make_request mr
+    req.query_string.must_equal ""
+    req.GET.must_be :empty?
+    req.POST.must_be :empty?
+    req.params.must_equal({})
+  end
+
+  it "clean up Safari's ajax POST body" do
+    req = make_request \
       Rack::MockRequest.env_for("/",
         'REQUEST_METHOD' => 'POST', :input => "foo=bar&quux=bla\0")
-    req.POST.should.equal "foo" => "bar", "quux" => "bla"
+    req.POST.must_equal "foo" => "bar", "quux" => "bla"
   end
 
-  should "get value by key from params with #[]" do
-    req = Rack::Request.new \
+  it "get value by key from params with #[]" do
+    req = make_request \
       Rack::MockRequest.env_for("?foo=quux")
-    req['foo'].should.equal 'quux'
-    req[:foo].should.equal 'quux'
+    req['foo'].must_equal 'quux'
+    req[:foo].must_equal 'quux'
   end
 
-  should "set value to key on params with #[]=" do
-    req = Rack::Request.new \
+  it "set value to key on params with #[]=" do
+    req = make_request \
       Rack::MockRequest.env_for("?foo=duh")
-    req['foo'].should.equal 'duh'
-    req[:foo].should.equal 'duh'
-    req.params.should.equal 'foo' => 'duh'
+    req['foo'].must_equal 'duh'
+    req[:foo].must_equal 'duh'
+    req.params.must_equal 'foo' => 'duh'
+
+    if req.delegate?
+      skip "delegate requests don't cache params, so mutations have no impact"
+    end
 
     req['foo'] = 'bar'
-    req.params.should.equal 'foo' => 'bar'
-    req['foo'].should.equal 'bar'
-    req[:foo].should.equal 'bar'
+    req.params.must_equal 'foo' => 'bar'
+    req['foo'].must_equal 'bar'
+    req[:foo].must_equal 'bar'
 
     req[:foo] = 'jaz'
-    req.params.should.equal 'foo' => 'jaz'
-    req['foo'].should.equal 'jaz'
-    req[:foo].should.equal 'jaz'
+    req.params.must_equal 'foo' => 'jaz'
+    req['foo'].must_equal 'jaz'
+    req[:foo].must_equal 'jaz'
   end
 
-  should "return values for the keys in the order given from values_at" do
-    req = Rack::Request.new \
+  it "return values for the keys in the order given from values_at" do
+    req = make_request \
       Rack::MockRequest.env_for("?foo=baz&wun=der&bar=ful")
-    req.values_at('foo').should.equal ['baz']
-    req.values_at('foo', 'wun').should.equal ['baz', 'der']
-    req.values_at('bar', 'foo', 'wun').should.equal ['ful', 'baz', 'der']
+    req.values_at('foo').must_equal ['baz']
+    req.values_at('foo', 'wun').must_equal ['baz', 'der']
+    req.values_at('bar', 'foo', 'wun').must_equal ['ful', 'baz', 'der']
   end
 
-  should "extract referrer correctly" do
-    req = Rack::Request.new \
+  it "extract referrer correctly" do
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_REFERER" => "/some/path")
-    req.referer.should.equal "/some/path"
+    req.referer.must_equal "/some/path"
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/")
-    req.referer.should.equal nil
+    req.referer.must_equal nil
   end
 
-  should "extract user agent correctly" do
-    req = Rack::Request.new \
+  it "extract user agent correctly" do
+    req = make_request \
       Rack::MockRequest.env_for("/", "HTTP_USER_AGENT" => "Mozilla/4.0 (compatible)")
-    req.user_agent.should.equal "Mozilla/4.0 (compatible)"
+    req.user_agent.must_equal "Mozilla/4.0 (compatible)"
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("/")
-    req.user_agent.should.equal nil
+    req.user_agent.must_equal nil
   end
 
-  should "treat missing content type as nil" do
-    req = Rack::Request.new \
+  it "treat missing content type as nil" do
+    req = make_request \
       Rack::MockRequest.env_for("/")
-    req.content_type.should.equal nil
+    req.content_type.must_equal nil
   end
 
-  should "treat empty content type as nil" do
-    req = Rack::Request.new \
+  it "treat empty content type as nil" do
+    req = make_request \
       Rack::MockRequest.env_for("/", "CONTENT_TYPE" => "")
-    req.content_type.should.equal nil
+    req.content_type.must_equal nil
   end
 
-  should "return nil media type for empty content type" do
-    req = Rack::Request.new \
+  it "return nil media type for empty content type" do
+    req = make_request \
       Rack::MockRequest.env_for("/", "CONTENT_TYPE" => "")
-    req.media_type.should.equal nil
+    req.media_type.must_equal nil
   end
 
-  should "cache, but invalidates the cache" do
-    req = Rack::Request.new \
+  it "cache, but invalidates the cache" do
+    req = make_request \
       Rack::MockRequest.env_for("/?foo=quux",
         "CONTENT_TYPE" => "application/x-www-form-urlencoded",
         :input => "foo=bar&quux=bla")
-    req.GET.should.equal "foo" => "quux"
-    req.GET.should.equal "foo" => "quux"
-    req.env["QUERY_STRING"] = "bla=foo"
-    req.GET.should.equal "bla" => "foo"
-    req.GET.should.equal "bla" => "foo"
+    req.GET.must_equal "foo" => "quux"
+    req.GET.must_equal "foo" => "quux"
+    req.set_header("QUERY_STRING", "bla=foo")
+    req.GET.must_equal "bla" => "foo"
+    req.GET.must_equal "bla" => "foo"
 
-    req.POST.should.equal "foo" => "bar", "quux" => "bla"
-    req.POST.should.equal "foo" => "bar", "quux" => "bla"
-    req.env["rack.input"] = StringIO.new("foo=bla&quux=bar")
-    req.POST.should.equal "foo" => "bla", "quux" => "bar"
-    req.POST.should.equal "foo" => "bla", "quux" => "bar"
+    req.POST.must_equal "foo" => "bar", "quux" => "bla"
+    req.POST.must_equal "foo" => "bar", "quux" => "bla"
+    req.set_header("rack.input", StringIO.new("foo=bla&quux=bar"))
+    req.POST.must_equal "foo" => "bla", "quux" => "bar"
+    req.POST.must_equal "foo" => "bla", "quux" => "bar"
   end
 
-  should "figure out if called via XHR" do
-    req = Rack::Request.new(Rack::MockRequest.env_for(""))
-    req.should.not.be.xhr
+  it "figure out if called via XHR" do
+    req = make_request(Rack::MockRequest.env_for(""))
+    req.wont_be :xhr?
 
-    req = Rack::Request.new \
+    req = make_request \
       Rack::MockRequest.env_for("", "HTTP_X_REQUESTED_WITH" => "XMLHttpRequest")
-    req.should.be.xhr
+    req.must_be :xhr?
   end
 
-  should "ssl detection" do
-    request = Rack::Request.new(Rack::MockRequest.env_for("/"))
-    request.scheme.should.equal "http"
-    request.should.not.be.ssl?
-
-    request = Rack::Request.new(Rack::MockRequest.env_for("/", 'HTTPS' => 'on'))
-    request.scheme.should.equal "https"
-    request.should.be.ssl?
+  it "ssl detection" do
+    request = make_request(Rack::MockRequest.env_for("/"))
+    request.scheme.must_equal "http"
+    request.wont_be :ssl?
 
-    request = Rack::Request.new(Rack::MockRequest.env_for("/", 'rack.url_scheme' => 'https'))
-    request.scheme.should.equal "https"
-    request.should.be.ssl?
+    request = make_request(Rack::MockRequest.env_for("/", 'HTTPS' => 'on'))
+    request.scheme.must_equal "https"
+    request.must_be :ssl?
 
-    request = Rack::Request.new(Rack::MockRequest.env_for("/", 'HTTP_HOST' => 'www.example.org:8080'))
-    request.scheme.should.equal "http"
-    request.should.not.be.ssl?
+    request = make_request(Rack::MockRequest.env_for("/", 'rack.url_scheme' => 'https'))
+    request.scheme.must_equal "https"
+    request.must_be :ssl?
 
-    request = Rack::Request.new(Rack::MockRequest.env_for("/", 'HTTP_HOST' => 'www.example.org:8443', 'HTTPS' => 'on'))
-    request.scheme.should.equal "https"
-    request.should.be.ssl?
+    request = make_request(Rack::MockRequest.env_for("/", 'HTTP_HOST' => 'www.example.org:8080'))
+    request.scheme.must_equal "http"
+    request.wont_be :ssl?
 
-    request = Rack::Request.new(Rack::MockRequest.env_for("/", 'HTTP_HOST' => 'www.example.org:8443', 'HTTP_X_FORWARDED_SSL' => 'on'))
-    request.scheme.should.equal "https"
-    request.should.be.ssl?
+    request = make_request(Rack::MockRequest.env_for("/", 'HTTP_HOST' => 'www.example.org:8443', 'HTTPS' => 'on'))
+    request.scheme.must_equal "https"
+    request.must_be :ssl?
 
-    request = Rack::Request.new(Rack::MockRequest.env_for("/", 'HTTP_X_FORWARDED_SCHEME' => 'https'))
-    request.scheme.should.equal "https"
-    request.should.be.ssl?
+    request = make_request(Rack::MockRequest.env_for("/", 'HTTP_HOST' => 'www.example.org:8443', 'HTTP_X_FORWARDED_SSL' => 'on'))
+    request.scheme.must_equal "https"
+    request.must_be :ssl?
 
-    request = Rack::Request.new(Rack::MockRequest.env_for("/", 'HTTP_X_FORWARDED_PROTO' => 'https'))
-    request.scheme.should.equal "https"
-    request.should.be.ssl?
+    request = make_request(Rack::MockRequest.env_for("/", 'HTTP_X_FORWARDED_SCHEME' => 'https'))
+    request.scheme.must_equal "https"
+    request.must_be :ssl?
 
-    request = Rack::Request.new(Rack::MockRequest.env_for("/", 'HTTP_X_FORWARDED_PROTO' => 'https, http, http'))
-    request.scheme.should.equal "https"
-    request.should.be.ssl?
-  end
+    request = make_request(Rack::MockRequest.env_for("/", 'HTTP_X_FORWARDED_PROTO' => 'https'))
+    request.scheme.must_equal "https"
+    request.must_be :ssl?
 
-  should "prevent scheme abuse" do
-    request = Rack::Request.new(Rack::MockRequest.env_for("/", 'HTTP_X_FORWARDED_SCHEME' => 'a."><script>alert(1)</script>'))
-    request.scheme.should.not.equal 'a."><script>alert(1)</script>'
+    request = make_request(Rack::MockRequest.env_for("/", 'HTTP_X_FORWARDED_PROTO' => 'https, http, http'))
+    request.scheme.must_equal "https"
+    request.must_be :ssl?
   end
 
-  should "parse cookies" do
-    req = Rack::Request.new \
+  it "parse cookies" do
+    req = make_request \
       Rack::MockRequest.env_for("", "HTTP_COOKIE" => "foo=bar;quux=h&m")
-    req.cookies.should.equal "foo" => "bar", "quux" => "h&m"
-    req.cookies.should.equal "foo" => "bar", "quux" => "h&m"
-    req.env.delete("HTTP_COOKIE")
-    req.cookies.should.equal({})
+    req.cookies.must_equal "foo" => "bar", "quux" => "h&m"
+    req.cookies.must_equal "foo" => "bar", "quux" => "h&m"
+    req.delete_header("HTTP_COOKIE")
+    req.cookies.must_equal({})
   end
 
-  should "always return the same hash object" do
-    req = Rack::Request.new \
+  it "always return the same hash object" do
+    req = make_request \
       Rack::MockRequest.env_for("", "HTTP_COOKIE" => "foo=bar;quux=h&m")
     hash = req.cookies
     req.env.delete("HTTP_COOKIE")
-    req.cookies.should.equal(hash)
+    req.cookies.must_equal hash
     req.env["HTTP_COOKIE"] = "zoo=m"
-    req.cookies.should.equal(hash)
+    req.cookies.must_equal hash
   end
 
-  should "modify the cookies hash in place" do
-    req = Rack::Request.new(Rack::MockRequest.env_for(""))
-    req.cookies.should.equal({})
+  it "modify the cookies hash in place" do
+    req = make_request(Rack::MockRequest.env_for(""))
+    req.cookies.must_equal({})
     req.cookies['foo'] = 'bar'
-    req.cookies.should.equal 'foo' => 'bar'
+    req.cookies.must_equal 'foo' => 'bar'
   end
 
-  should "not modify the params hash in place" do
+  it "not modify the params hash in place" do
     e = Rack::MockRequest.env_for("")
-    req1 = Rack::Request.new(e)
-    req1.params.should.equal({})
+    req1 = make_request(e)
+    if req1.delegate?
+      skip "delegate requests don't cache params, so mutations have no impact"
+    end
+    req1.params.must_equal({})
     req1.params['foo'] = 'bar'
-    req1.params.should.equal 'foo' => 'bar'
-    req2 = Rack::Request.new(e)
-    req2.params.should.equal({})
+    req1.params.must_equal 'foo' => 'bar'
+    req2 = make_request(e)
+    req2.params.must_equal({})
   end
 
-  should "modify params hash if param is in GET" do
+  it "modify params hash if param is in GET" do
     e = Rack::MockRequest.env_for("?foo=duh")
-    req1 = Rack::Request.new(e)
-    req1.params.should.equal 'foo' => 'duh'
+    req1 = make_request(e)
+    req1.params.must_equal 'foo' => 'duh'
     req1.update_param 'foo', 'bar'
-    req1.params.should.equal 'foo' => 'bar'
-    req2 = Rack::Request.new(e)
-    req2.params.should.equal 'foo' => 'bar'
+    req1.params.must_equal 'foo' => 'bar'
+    req2 = make_request(e)
+    req2.params.must_equal 'foo' => 'bar'
   end
 
-  should "modify params hash if param is in POST" do
+  it "modify params hash if param is in POST" do
     e = Rack::MockRequest.env_for("", "REQUEST_METHOD" => 'POST', :input => 'foo=duh')
-    req1 = Rack::Request.new(e)
-    req1.params.should.equal 'foo' => 'duh'
+    req1 = make_request(e)
+    req1.params.must_equal 'foo' => 'duh'
     req1.update_param 'foo', 'bar'
-    req1.params.should.equal 'foo' => 'bar'
-    req2 = Rack::Request.new(e)
-    req2.params.should.equal 'foo' => 'bar'
+    req1.params.must_equal 'foo' => 'bar'
+    req2 = make_request(e)
+    req2.params.must_equal 'foo' => 'bar'
   end
 
-  should "modify params hash, even if param didn't exist before" do
+  it "modify params hash, even if param didn't exist before" do
     e = Rack::MockRequest.env_for("")
-    req1 = Rack::Request.new(e)
-    req1.params.should.equal({})
+    req1 = make_request(e)
+    req1.params.must_equal({})
     req1.update_param 'foo', 'bar'
-    req1.params.should.equal 'foo' => 'bar'
-    req2 = Rack::Request.new(e)
-    req2.params.should.equal 'foo' => 'bar'
+    req1.params.must_equal 'foo' => 'bar'
+    req2 = make_request(e)
+    req2.params.must_equal 'foo' => 'bar'
   end
 
-  should "modify params hash by changing only GET" do
+  it "modify params hash by changing only GET" do
     e = Rack::MockRequest.env_for("?foo=duhget")
-    req = Rack::Request.new(e)
-    req.GET.should.equal 'foo' => 'duhget'
-    req.POST.should.equal({})
+    req = make_request(e)
+    req.GET.must_equal 'foo' => 'duhget'
+    req.POST.must_equal({})
     req.update_param 'foo', 'bar'
-    req.GET.should.equal 'foo' => 'bar'
-    req.POST.should.equal({})
+    req.GET.must_equal 'foo' => 'bar'
+    req.POST.must_equal({})
   end
 
-  should "modify params hash by changing only POST" do
+  it "modify params hash by changing only POST" do
     e = Rack::MockRequest.env_for("", "REQUEST_METHOD" => 'POST', :input => "foo=duhpost")
-    req = Rack::Request.new(e)
-    req.GET.should.equal({})
-    req.POST.should.equal 'foo' => 'duhpost'
+    req = make_request(e)
+    req.GET.must_equal({})
+    req.POST.must_equal 'foo' => 'duhpost'
     req.update_param 'foo', 'bar'
-    req.GET.should.equal({})
-    req.POST.should.equal 'foo' => 'bar'
+    req.GET.must_equal({})
+    req.POST.must_equal 'foo' => 'bar'
   end
 
-  should "modify params hash, even if param is defined in both POST and GET" do
+  it "modify params hash, even if param is defined in both POST and GET" do
     e = Rack::MockRequest.env_for("?foo=duhget", "REQUEST_METHOD" => 'POST', :input => "foo=duhpost")
-    req1 = Rack::Request.new(e)
-    req1.GET.should.equal 'foo' => 'duhget'
-    req1.POST.should.equal 'foo' => 'duhpost'
-    req1.params.should.equal 'foo' => 'duhpost'
+    req1 = make_request(e)
+    req1.GET.must_equal 'foo' => 'duhget'
+    req1.POST.must_equal 'foo' => 'duhpost'
+    req1.params.must_equal 'foo' => 'duhpost'
     req1.update_param 'foo', 'bar'
-    req1.GET.should.equal 'foo' => 'bar'
-    req1.POST.should.equal 'foo' => 'bar'
-    req1.params.should.equal 'foo' => 'bar'
-    req2 = Rack::Request.new(e)
-    req2.GET.should.equal 'foo' => 'bar'
-    req2.POST.should.equal 'foo' => 'bar'
-    req2.params.should.equal 'foo' => 'bar'
-    req2.params.should.equal 'foo' => 'bar'
+    req1.GET.must_equal 'foo' => 'bar'
+    req1.POST.must_equal 'foo' => 'bar'
+    req1.params.must_equal 'foo' => 'bar'
+    req2 = make_request(e)
+    req2.GET.must_equal 'foo' => 'bar'
+    req2.POST.must_equal 'foo' => 'bar'
+    req2.params.must_equal 'foo' => 'bar'
+    req2.params.must_equal 'foo' => 'bar'
   end
 
-  should "allow deleting from params hash if param is in GET" do
+  it "allow deleting from params hash if param is in GET" do
     e = Rack::MockRequest.env_for("?foo=bar")
-    req1 = Rack::Request.new(e)
-    req1.params.should.equal 'foo' => 'bar'
-    req1.delete_param('foo').should.equal 'bar'
-    req1.params.should.equal({})
-    req2 = Rack::Request.new(e)
-    req2.params.should.equal({})
+    req1 = make_request(e)
+    req1.params.must_equal 'foo' => 'bar'
+    req1.delete_param('foo').must_equal 'bar'
+    req1.params.must_equal({})
+    req2 = make_request(e)
+    req2.params.must_equal({})
   end
 
-  should "allow deleting from params hash if param is in POST" do
+  it "allow deleting from params hash if param is in POST" do
     e = Rack::MockRequest.env_for("", "REQUEST_METHOD" => 'POST', :input => 'foo=bar')
-    req1 = Rack::Request.new(e)
-    req1.params.should.equal 'foo' => 'bar'
-    req1.delete_param('foo').should.equal 'bar'
-    req1.params.should.equal({})
-    req2 = Rack::Request.new(e)
-    req2.params.should.equal({})
+    req1 = make_request(e)
+    req1.params.must_equal 'foo' => 'bar'
+    req1.delete_param('foo').must_equal 'bar'
+    req1.params.must_equal({})
+    req2 = make_request(e)
+    req2.params.must_equal({})
   end
 
-  should "pass through non-uri escaped cookies as-is" do
-    req = Rack::Request.new Rack::MockRequest.env_for("", "HTTP_COOKIE" => "foo=%")
-    req.cookies["foo"].should == "%"
+  it "pass through non-uri escaped cookies as-is" do
+    req = make_request Rack::MockRequest.env_for("", "HTTP_COOKIE" => "foo=%")
+    req.cookies["foo"].must_equal "%"
   end
 
-  should "parse cookies according to RFC 2109" do
-    req = Rack::Request.new \
+  it "parse cookies according to RFC 2109" do
+    req = make_request \
       Rack::MockRequest.env_for('', 'HTTP_COOKIE' => 'foo=bar;foo=car')
-    req.cookies.should.equal 'foo' => 'bar'
+    req.cookies.must_equal 'foo' => 'bar'
   end
 
-  should 'parse cookies with quotes' do
-    req = Rack::Request.new Rack::MockRequest.env_for('', {
+  it 'parse cookies with quotes' do
+    req = make_request Rack::MockRequest.env_for('', {
       'HTTP_COOKIE' => '$Version="1"; Customer="WILE_E_COYOTE"; $Path="/acme"; Part_Number="Rocket_Launcher_0001"; $Path="/acme"'
     })
-    req.cookies.should.equal({
+    req.cookies.must_equal({
       '$Version'    => '"1"',
       'Customer'    => '"WILE_E_COYOTE"',
       '$Path'       => '"/acme"',
@@ -576,88 +721,88 @@ describe Rack::Request do
     })
   end
 
-  should "provide setters" do
-    req = Rack::Request.new(e=Rack::MockRequest.env_for(""))
-    req.script_name.should.equal ""
+  it "provide setters" do
+    req = make_request(e=Rack::MockRequest.env_for(""))
+    req.script_name.must_equal ""
     req.script_name = "/foo"
-    req.script_name.should.equal "/foo"
-    e["SCRIPT_NAME"].should.equal "/foo"
+    req.script_name.must_equal "/foo"
+    e["SCRIPT_NAME"].must_equal "/foo"
 
-    req.path_info.should.equal "/"
+    req.path_info.must_equal "/"
     req.path_info = "/foo"
-    req.path_info.should.equal "/foo"
-    e["PATH_INFO"].should.equal "/foo"
-  end
-
-  should "provide the original env" do
-    req = Rack::Request.new(e = Rack::MockRequest.env_for(""))
-    req.env.should == e
-  end
-
-  should "restore the base URL" do
-    Rack::Request.new(Rack::MockRequest.env_for("")).base_url.
-      should.equal "http://example.org"
-    Rack::Request.new(Rack::MockRequest.env_for("", "SCRIPT_NAME" => "/foo")).base_url.
-      should.equal "http://example.org"
-  end
-
-  should "restore the URL" do
-    Rack::Request.new(Rack::MockRequest.env_for("")).url.
-      should.equal "http://example.org/"
-    Rack::Request.new(Rack::MockRequest.env_for("", "SCRIPT_NAME" => "/foo")).url.
-      should.equal "http://example.org/foo/"
-    Rack::Request.new(Rack::MockRequest.env_for("/foo")).url.
-      should.equal "http://example.org/foo"
-    Rack::Request.new(Rack::MockRequest.env_for("?foo")).url.
-      should.equal "http://example.org/?foo"
-    Rack::Request.new(Rack::MockRequest.env_for("http://example.org:8080/")).url.
-      should.equal "http://example.org:8080/"
-    Rack::Request.new(Rack::MockRequest.env_for("https://example.org/")).url.
-      should.equal "https://example.org/"
-    Rack::Request.new(Rack::MockRequest.env_for("coffee://example.org/")).url.
-      should.equal "coffee://example.org/"
-    Rack::Request.new(Rack::MockRequest.env_for("coffee://example.org:443/")).url.
-      should.equal "coffee://example.org:443/"
-    Rack::Request.new(Rack::MockRequest.env_for("https://example.com:8080/foo?foo")).url.
-      should.equal "https://example.com:8080/foo?foo"
-  end
-
-  should "restore the full path" do
-    Rack::Request.new(Rack::MockRequest.env_for("")).fullpath.
-      should.equal "/"
-    Rack::Request.new(Rack::MockRequest.env_for("", "SCRIPT_NAME" => "/foo")).fullpath.
-      should.equal "/foo/"
-    Rack::Request.new(Rack::MockRequest.env_for("/foo")).fullpath.
-      should.equal "/foo"
-    Rack::Request.new(Rack::MockRequest.env_for("?foo")).fullpath.
-      should.equal "/?foo"
-    Rack::Request.new(Rack::MockRequest.env_for("http://example.org:8080/")).fullpath.
-      should.equal "/"
-    Rack::Request.new(Rack::MockRequest.env_for("https://example.org/")).fullpath.
-      should.equal "/"
-
-    Rack::Request.new(Rack::MockRequest.env_for("https://example.com:8080/foo?foo")).fullpath.
-      should.equal "/foo?foo"
-  end
-
-  should "handle multiple media type parameters" do
-    req = Rack::Request.new \
+    req.path_info.must_equal "/foo"
+    e["PATH_INFO"].must_equal "/foo"
+  end
+
+  it "provide the original env" do
+    req = make_request(e = Rack::MockRequest.env_for(""))
+    req.env.must_equal e
+  end
+
+  it "restore the base URL" do
+    make_request(Rack::MockRequest.env_for("")).base_url.
+      must_equal "http://example.org"
+    make_request(Rack::MockRequest.env_for("", "SCRIPT_NAME" => "/foo")).base_url.
+      must_equal "http://example.org"
+  end
+
+  it "restore the URL" do
+    make_request(Rack::MockRequest.env_for("")).url.
+      must_equal "http://example.org/"
+    make_request(Rack::MockRequest.env_for("", "SCRIPT_NAME" => "/foo")).url.
+      must_equal "http://example.org/foo/"
+    make_request(Rack::MockRequest.env_for("/foo")).url.
+      must_equal "http://example.org/foo"
+    make_request(Rack::MockRequest.env_for("?foo")).url.
+      must_equal "http://example.org/?foo"
+    make_request(Rack::MockRequest.env_for("http://example.org:8080/")).url.
+      must_equal "http://example.org:8080/"
+    make_request(Rack::MockRequest.env_for("https://example.org/")).url.
+      must_equal "https://example.org/"
+    make_request(Rack::MockRequest.env_for("coffee://example.org/")).url.
+      must_equal "coffee://example.org/"
+    make_request(Rack::MockRequest.env_for("coffee://example.org:443/")).url.
+      must_equal "coffee://example.org:443/"
+    make_request(Rack::MockRequest.env_for("https://example.com:8080/foo?foo")).url.
+      must_equal "https://example.com:8080/foo?foo"
+  end
+
+  it "restore the full path" do
+    make_request(Rack::MockRequest.env_for("")).fullpath.
+      must_equal "/"
+    make_request(Rack::MockRequest.env_for("", "SCRIPT_NAME" => "/foo")).fullpath.
+      must_equal "/foo/"
+    make_request(Rack::MockRequest.env_for("/foo")).fullpath.
+      must_equal "/foo"
+    make_request(Rack::MockRequest.env_for("?foo")).fullpath.
+      must_equal "/?foo"
+    make_request(Rack::MockRequest.env_for("http://example.org:8080/")).fullpath.
+      must_equal "/"
+    make_request(Rack::MockRequest.env_for("https://example.org/")).fullpath.
+      must_equal "/"
+
+    make_request(Rack::MockRequest.env_for("https://example.com:8080/foo?foo")).fullpath.
+     must_equal "/foo?foo"
+  end
+
+  it "handle multiple media type parameters" do
+    req = make_request \
       Rack::MockRequest.env_for("/",
         "CONTENT_TYPE" => 'text/plain; foo=BAR,baz=bizzle dizzle;BLING=bam;blong="boo";zump="zoo\"o";weird=lol"')
-      req.should.not.be.form_data
-      req.media_type_params.should.include 'foo'
-      req.media_type_params['foo'].should.equal 'BAR'
-      req.media_type_params.should.include 'baz'
-      req.media_type_params['baz'].should.equal 'bizzle dizzle'
-      req.media_type_params.should.not.include 'BLING'
-      req.media_type_params.should.include 'bling'
-      req.media_type_params['bling'].should.equal 'bam'
-      req.media_type_params['blong'].should.equal 'boo'
-      req.media_type_params['zump'].should.equal 'zoo\"o'
-      req.media_type_params['weird'].should.equal 'lol"'
-  end
-
-  should "parse with junk before boundry" do
+      req.wont_be :form_data?
+      req.media_type_params.must_include 'foo'
+      req.media_type_params['foo'].must_equal 'BAR'
+      req.media_type_params.must_include 'baz'
+      req.media_type_params['baz'].must_equal 'bizzle dizzle'
+      req.media_type_params.wont_include 'BLING'
+      req.media_type_params.must_include 'bling'
+      req.media_type_params['bling'].must_equal 'bam'
+      req.media_type_params['blong'].must_equal 'boo'
+      req.media_type_params['zump'].must_equal 'zoo\"o'
+      req.media_type_params['weird'].must_equal 'lol"'
+  end
+
+  it "parse with junk before boundary" do
     # Adapted from RFC 1867.
     input = <<EOF
 blah blah\r
@@ -674,31 +819,31 @@ Content-Transfer-Encoding: base64\r
 /9j/4AAQSkZJRgABAQAAAQABAAD//gA+Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcg\r
 --AaB03x--\r
 EOF
-    req = Rack::Request.new Rack::MockRequest.env_for("/",
+    req = make_request Rack::MockRequest.env_for("/",
                       "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
                       "CONTENT_LENGTH" => input.size,
                       :input => input)
 
-    req.POST.should.include "fileupload"
-    req.POST.should.include "reply"
+    req.POST.must_include "fileupload"
+    req.POST.must_include "reply"
 
-    req.should.be.form_data
-    req.content_length.should.equal input.size
-    req.media_type.should.equal 'multipart/form-data'
-    req.media_type_params.should.include 'boundary'
-    req.media_type_params['boundary'].should.equal 'AaB03x'
+    req.must_be :form_data?
+    req.content_length.must_equal input.size
+    req.media_type.must_equal 'multipart/form-data'
+    req.media_type_params.must_include 'boundary'
+    req.media_type_params['boundary'].must_equal 'AaB03x'
 
-    req.POST["reply"].should.equal "yes"
+    req.POST["reply"].must_equal "yes"
 
     f = req.POST["fileupload"]
-    f.should.be.kind_of Hash
-    f[:type].should.equal "image/jpeg"
-    f[:filename].should.equal "dj.jpg"
-    f.should.include :tempfile
-    f[:tempfile].size.should.equal 76
+    f.must_be_kind_of Hash
+    f[:type].must_equal "image/jpeg"
+    f[:filename].must_equal "dj.jpg"
+    f.must_include :tempfile
+    f[:tempfile].size.must_equal 76
   end
 
-  should "not infinite loop with a malformed HTTP request" do
+  it "not infinite loop with a malformed HTTP request" do
     # Adapted from RFC 1867.
     input = <<EOF
 --AaB03x
@@ -713,16 +858,16 @@ Content-Transfer-Encoding: base64
 /9j/4AAQSkZJRgABAQAAAQABAAD//gA+Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcg
 --AaB03x--
 EOF
-    req = Rack::Request.new Rack::MockRequest.env_for("/",
+    req = make_request Rack::MockRequest.env_for("/",
                       "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
                       "CONTENT_LENGTH" => input.size,
                       :input => input)
 
-    lambda{req.POST}.should.raise(EOFError)
+    lambda{req.POST}.must_raise EOFError
   end
 
 
-  should "parse multipart form data" do
+  it "parse multipart form data" do
     # Adapted from RFC 1867.
     input = <<EOF
 --AaB03x\r
@@ -737,47 +882,73 @@ Content-Transfer-Encoding: base64\r
 /9j/4AAQSkZJRgABAQAAAQABAAD//gA+Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcg\r
 --AaB03x--\r
 EOF
-    req = Rack::Request.new Rack::MockRequest.env_for("/",
+    req = make_request Rack::MockRequest.env_for("/",
                       "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
                       "CONTENT_LENGTH" => input.size,
                       :input => input)
 
-    req.POST.should.include "fileupload"
-    req.POST.should.include "reply"
+    req.POST.must_include "fileupload"
+    req.POST.must_include "reply"
 
-    req.should.be.form_data
-    req.content_length.should.equal input.size
-    req.media_type.should.equal 'multipart/form-data'
-    req.media_type_params.should.include 'boundary'
-    req.media_type_params['boundary'].should.equal 'AaB03x'
+    req.must_be :form_data?
+    req.content_length.must_equal input.size
+    req.media_type.must_equal 'multipart/form-data'
+    req.media_type_params.must_include 'boundary'
+    req.media_type_params['boundary'].must_equal 'AaB03x'
 
-    req.POST["reply"].should.equal "yes"
+    req.POST["reply"].must_equal "yes"
 
     f = req.POST["fileupload"]
-    f.should.be.kind_of Hash
-    f[:type].should.equal "image/jpeg"
-    f[:filename].should.equal "dj.jpg"
-    f.should.include :tempfile
-    f[:tempfile].size.should.equal 76
+    f.must_be_kind_of Hash
+    f[:type].must_equal "image/jpeg"
+    f[:filename].must_equal "dj.jpg"
+    f.must_include :tempfile
+    f[:tempfile].size.must_equal 76
+  end
+
+  it "MultipartPartLimitError when request has too many multipart parts if limit set" do
+    begin
+      data = 10000.times.map { "--AaB03x\r\nContent-Type: text/plain\r\nContent-Disposition: attachment; name=#{SecureRandom.hex(10)}; filename=#{SecureRandom.hex(10)}\r\n\r\ncontents\r\n" }.join("\r\n")
+      data += "--AaB03x--\r"
+
+      options = {
+        "CONTENT_TYPE" => "multipart/form-data; boundary=AaB03x",
+        "CONTENT_LENGTH" => data.length.to_s,
+        :input => StringIO.new(data)
+      }
+
+      request = make_request Rack::MockRequest.env_for("/", options)
+      lambda { request.POST }.must_raise Rack::Multipart::MultipartPartLimitError
+    end
   end
 
-  should "MultipartPartLimitError when request has too many multipart parts if limit set" do
+  it 'closes tempfiles it created in the case of too many created' do
     begin
       data = 10000.times.map { "--AaB03x\r\nContent-Type: text/plain\r\nContent-Disposition: attachment; name=#{SecureRandom.hex(10)}; filename=#{SecureRandom.hex(10)}\r\n\r\ncontents\r\n" }.join("\r\n")
       data += "--AaB03x--\r"
 
+      files = []
       options = {
         "CONTENT_TYPE" => "multipart/form-data; boundary=AaB03x",
         "CONTENT_LENGTH" => data.length.to_s,
+        Rack::RACK_MULTIPART_TEMPFILE_FACTORY => lambda { |filename, content_type|
+          file = Tempfile.new(["RackMultipart", ::File.extname(filename)])
+          files << file
+          file
+        },
         :input => StringIO.new(data)
       }
 
-      request = Rack::Request.new Rack::MockRequest.env_for("/", options)
-      lambda { request.POST }.should.raise(Rack::Multipart::MultipartPartLimitError)
+      request = make_request Rack::MockRequest.env_for("/", options)
+      assert_raises(Rack::Multipart::MultipartPartLimitError) do
+        request.POST
+      end
+      refute_predicate files, :empty?
+      files.each { |f| assert_predicate f, :closed? }
     end
   end
 
-  should "parse big multipart form data" do
+  it "parse big multipart form data" do
     input = <<EOF
 --AaB03x\r
 content-disposition: form-data; name="huge"; filename="huge"\r
@@ -789,17 +960,17 @@ content-disposition: form-data; name="mean"; filename="mean"\r
 --AaB03xha\r
 --AaB03x--\r
 EOF
-    req = Rack::Request.new Rack::MockRequest.env_for("/",
+    req = make_request Rack::MockRequest.env_for("/",
                       "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
                       "CONTENT_LENGTH" => input.size,
                       :input => input)
 
-    req.POST["huge"][:tempfile].size.should.equal 32768
-    req.POST["mean"][:tempfile].size.should.equal 10
-    req.POST["mean"][:tempfile].read.should.equal "--AaB03xha"
+    req.POST["huge"][:tempfile].size.must_equal 32768
+    req.POST["mean"][:tempfile].size.must_equal 10
+    req.POST["mean"][:tempfile].read.must_equal "--AaB03xha"
   end
 
-  should "record tempfiles from multipart form data in env[rack.tempfiles]" do
+  it "record tempfiles from multipart form data in env[rack.tempfiles]" do
     input = <<EOF
 --AaB03x\r
 content-disposition: form-data; name="fileupload"; filename="foo.jpg"\r
@@ -819,22 +990,22 @@ EOF
                           "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
                           "CONTENT_LENGTH" => input.size,
                           :input => input)
-    req = Rack::Request.new(env)
+    req = make_request(env)
     req.params
-    env['rack.tempfiles'].size.should.equal(2)
+    env['rack.tempfiles'].size.must_equal 2
   end
 
-  should "detect invalid multipart form data" do
+  it "detect invalid multipart form data" do
     input = <<EOF
 --AaB03x\r
 content-disposition: form-data; name="huge"; filename="huge"\r
 EOF
-    req = Rack::Request.new Rack::MockRequest.env_for("/",
+    req = make_request Rack::MockRequest.env_for("/",
                       "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
                       "CONTENT_LENGTH" => input.size,
                       :input => input)
 
-    lambda { req.POST }.should.raise(EOFError)
+    lambda { req.POST }.must_raise EOFError
 
     input = <<EOF
 --AaB03x\r
@@ -842,12 +1013,12 @@ content-disposition: form-data; name="huge"; filename="huge"\r
 \r
 foo\r
 EOF
-    req = Rack::Request.new Rack::MockRequest.env_for("/",
+    req = make_request Rack::MockRequest.env_for("/",
                       "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
                       "CONTENT_LENGTH" => input.size,
                       :input => input)
 
-    lambda { req.POST }.should.raise(EOFError)
+    lambda { req.POST }.must_raise EOFError
 
     input = <<EOF
 --AaB03x\r
@@ -855,29 +1026,29 @@ content-disposition: form-data; name="huge"; filename="huge"\r
 \r
 foo\r
 EOF
-    req = Rack::Request.new Rack::MockRequest.env_for("/",
+    req = make_request Rack::MockRequest.env_for("/",
                       "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
                       "CONTENT_LENGTH" => input.size,
                       :input => input)
 
-    lambda { req.POST }.should.raise(EOFError)
+    lambda { req.POST }.must_raise EOFError
   end
 
-  should "consistently raise EOFError on bad multipart form data" do
+  it "consistently raise EOFError on bad multipart form data" do
     input = <<EOF
 --AaB03x\r
 content-disposition: form-data; name="huge"; filename="huge"\r
 EOF
-    req = Rack::Request.new Rack::MockRequest.env_for("/",
+    req = make_request Rack::MockRequest.env_for("/",
                       "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
                       "CONTENT_LENGTH" => input.size,
                       :input => input)
 
-    lambda { req.POST }.should.raise(EOFError)
-    lambda { req.POST }.should.raise(EOFError)
+    lambda { req.POST }.must_raise EOFError
+    lambda { req.POST }.must_raise EOFError
   end
 
-  should "correctly parse the part name from Content-Id header" do
+  it "correctly parse the part name from Content-Id header" do
     input = <<EOF
 --AaB03x\r
 Content-Type: text/xml; charset=utf-8\r
@@ -887,20 +1058,15 @@ Content-Transfer-Encoding: 7bit\r
 foo\r
 --AaB03x--\r
 EOF
-    req = Rack::Request.new Rack::MockRequest.env_for("/",
+    req = make_request Rack::MockRequest.env_for("/",
                       "CONTENT_TYPE" => "multipart/related, boundary=AaB03x",
                       "CONTENT_LENGTH" => input.size,
                       :input => input)
 
-    req.params.keys.should.equal ["<soap-start>"]
+    req.params.keys.must_equal ["<soap-start>"]
   end
 
-  should "not try to interpret binary as utf8" do
-    if /regexp/.respond_to?(:kcode) # < 1.9
-      begin
-        original_kcode = $KCODE
-        $KCODE='UTF8'
-
+  it "not try to interpret binary as utf8" do
         input = <<EOF
 --AaB03x\r
 content-disposition: form-data; name="fileupload"; filename="junk.a"\r
@@ -910,77 +1076,33 @@ content-type: application/octet-stream\r
 --AaB03x--\r
 EOF
 
-        req = Rack::Request.new Rack::MockRequest.env_for("/",
+        req = make_request Rack::MockRequest.env_for("/",
                           "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
                           "CONTENT_LENGTH" => input.size,
                           :input => input)
 
-        lambda{req.POST}.should.not.raise(EOFError)
-        req.POST["fileupload"][:tempfile].size.should.equal 4
-      ensure
-        $KCODE = original_kcode
-      end
-    else # >= 1.9
-        input = <<EOF
---AaB03x\r
-content-disposition: form-data; name="fileupload"; filename="junk.a"\r
-content-type: application/octet-stream\r
-\r
-#{[0x36,0xCF,0x0A,0xF8].pack('c*')}\r
---AaB03x--\r
-EOF
-
-      req = Rack::Request.new Rack::MockRequest.env_for("/",
-                        "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
-                        "CONTENT_LENGTH" => input.size,
-                        :input => input)
-
-      lambda{req.POST}.should.not.raise(EOFError)
-      req.POST["fileupload"][:tempfile].size.should.equal 4
-    end
+    req.POST["fileupload"][:tempfile].size.must_equal 4
   end
 
-  should "work around buggy 1.8.* Tempfile equality" do
-    input = <<EOF
---AaB03x\r
-content-disposition: form-data; name="huge"; filename="huge"\r
-\r
-foo\r
---AaB03x--
-EOF
-
-    rack_input = Tempfile.new("rackspec")
-    rack_input.write(input)
-    rack_input.rewind
-
-    req = Rack::Request.new Rack::MockRequest.env_for("/",
-                      "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
-                      "CONTENT_LENGTH" => input.size,
-                      :input => rack_input)
-
-    lambda{ req.POST }.should.not.raise
-    lambda{ req.POST }.should.not.raise("input re-processed!")
-  end
-
-  should "use form_hash when form_input is a Tempfile" do
+  it "use form_hash when form_input is a Tempfile" do
     input = "{foo: 'bar'}"
 
     rack_input = Tempfile.new("rackspec")
     rack_input.write(input)
     rack_input.rewind
 
-    req = Rack::Request.new Rack::MockRequest.env_for("/",
+    req = make_request Rack::MockRequest.env_for("/",
                       "rack.request.form_hash" => {'foo' => 'bar'},
                       "rack.request.form_input" => rack_input,
                       :input => rack_input)
 
-    req.POST.should.equal(req.env['rack.request.form_hash'])
+    req.POST.must_equal req.env['rack.request.form_hash']
   end
 
-  should "conform to the Rack spec" do
+  it "conform to the Rack spec" do
     app = lambda { |env|
-      content = Rack::Request.new(env).POST["file"].inspect
-      size = content.respond_to?(:bytesize) ? content.bytesize : content.size
+      content = make_request(env).POST["file"].inspect
+      size = content.bytesize
       [200, {"Content-Type" => "text/html", "Content-Length" => size.to_s}, [content]]
     }
 
@@ -997,149 +1119,151 @@ Content-Transfer-Encoding: base64\r
 /9j/4AAQSkZJRgABAQAAAQABAAD//gA+Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcg\r
 --AaB03x--\r
 EOF
-    input.force_encoding("ASCII-8BIT") if input.respond_to? :force_encoding
+    input.force_encoding(Encoding::ASCII_8BIT)
     res = Rack::MockRequest.new(Rack::Lint.new(app)).get "/",
       "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x",
       "CONTENT_LENGTH" => input.size.to_s, "rack.input" => StringIO.new(input)
 
-    res.should.be.ok
+    res.must_be :ok?
   end
 
-  should "parse Accept-Encoding correctly" do
+  it "parse Accept-Encoding correctly" do
     parser = lambda do |x|
-      Rack::Request.new(Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => x)).accept_encoding
+      make_request(Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => x)).accept_encoding
     end
 
-    parser.call(nil).should.equal([])
+    parser.call(nil).must_equal []
 
-    parser.call("compress, gzip").should.equal([["compress", 1.0], ["gzip", 1.0]])
-    parser.call("").should.equal([])
-    parser.call("*").should.equal([["*", 1.0]])
-    parser.call("compress;q=0.5, gzip;q=1.0").should.equal([["compress", 0.5], ["gzip", 1.0]])
-    parser.call("gzip;q=1.0, identity; q=0.5, *;q=0").should.equal([["gzip", 1.0], ["identity", 0.5], ["*", 0] ])
+    parser.call("compress, gzip").must_equal [["compress", 1.0], ["gzip", 1.0]]
+    parser.call("").must_equal []
+    parser.call("*").must_equal [["*", 1.0]]
+    parser.call("compress;q=0.5, gzip;q=1.0").must_equal [["compress", 0.5], ["gzip", 1.0]]
+    parser.call("gzip;q=1.0, identity; q=0.5, *;q=0").must_equal [["gzip", 1.0], ["identity", 0.5], ["*", 0] ]
 
-    parser.call("gzip ; q=0.9").should.equal([["gzip", 0.9]])
-    parser.call("gzip ; deflate").should.equal([["gzip", 1.0]])
+    parser.call("gzip ; q=0.9").must_equal [["gzip", 0.9]]
+    parser.call("gzip ; deflate").must_equal [["gzip", 1.0]]
   end
 
-  should "parse Accept-Language correctly" do
+  it "parse Accept-Language correctly" do
     parser = lambda do |x|
-      Rack::Request.new(Rack::MockRequest.env_for("", "HTTP_ACCEPT_LANGUAGE" => x)).accept_language
+      make_request(Rack::MockRequest.env_for("", "HTTP_ACCEPT_LANGUAGE" => x)).accept_language
     end
 
-    parser.call(nil).should.equal([])
+    parser.call(nil).must_equal []
 
-    parser.call("fr, en").should.equal([["fr", 1.0], ["en", 1.0]])
-    parser.call("").should.equal([])
-    parser.call("*").should.equal([["*", 1.0]])
-    parser.call("fr;q=0.5, en;q=1.0").should.equal([["fr", 0.5], ["en", 1.0]])
-    parser.call("fr;q=1.0, en; q=0.5, *;q=0").should.equal([["fr", 1.0], ["en", 0.5], ["*", 0] ])
+    parser.call("fr, en").must_equal [["fr", 1.0], ["en", 1.0]]
+    parser.call("").must_equal []
+    parser.call("*").must_equal [["*", 1.0]]
+    parser.call("fr;q=0.5, en;q=1.0").must_equal [["fr", 0.5], ["en", 1.0]]
+    parser.call("fr;q=1.0, en; q=0.5, *;q=0").must_equal [["fr", 1.0], ["en", 0.5], ["*", 0] ]
 
-    parser.call("fr ; q=0.9").should.equal([["fr", 0.9]])
-    parser.call("fr").should.equal([["fr", 1.0]])
+    parser.call("fr ; q=0.9").must_equal [["fr", 0.9]]
+    parser.call("fr").must_equal [["fr", 1.0]]
   end
 
-  ip_app = lambda { |env|
-    request = Rack::Request.new(env)
-    response = Rack::Response.new
-    response.write request.ip
-    response.finish
-  }
+  def ip_app
+    lambda { |env|
+      request = make_request(env)
+      response = Rack::Response.new
+      response.write request.ip
+      response.finish
+    }
+  end
 
-  should 'provide ip information' do
+  it 'provide ip information' do
     mock = Rack::MockRequest.new(Rack::Lint.new(ip_app))
 
     res = mock.get '/', 'REMOTE_ADDR' => '1.2.3.4'
-    res.body.should.equal '1.2.3.4'
+    res.body.must_equal '1.2.3.4'
 
     res = mock.get '/', 'REMOTE_ADDR' => 'fe80::202:b3ff:fe1e:8329'
-    res.body.should.equal 'fe80::202:b3ff:fe1e:8329'
+    res.body.must_equal 'fe80::202:b3ff:fe1e:8329'
 
     res = mock.get '/', 'REMOTE_ADDR' => '1.2.3.4,3.4.5.6'
-    res.body.should.equal '1.2.3.4'
+    res.body.must_equal '1.2.3.4'
   end
 
-  should 'deals with proxies' do
+  it 'deals with proxies' do
     mock = Rack::MockRequest.new(Rack::Lint.new(ip_app))
 
     res = mock.get '/',
       'REMOTE_ADDR' => '1.2.3.4',
       'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
-    res.body.should.equal '1.2.3.4'
+    res.body.must_equal '1.2.3.4'
 
     res = mock.get '/',
       'REMOTE_ADDR' => '1.2.3.4',
       'HTTP_X_FORWARDED_FOR' => 'unknown'
-    res.body.should.equal '1.2.3.4'
+    res.body.must_equal '1.2.3.4'
 
     res = mock.get '/',
       'REMOTE_ADDR' => '127.0.0.1',
       'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
-    res.body.should.equal '3.4.5.6'
+    res.body.must_equal '3.4.5.6'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => 'unknown,3.4.5.6'
-    res.body.should.equal '3.4.5.6'
+    res.body.must_equal '3.4.5.6'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => '192.168.0.1,3.4.5.6'
-    res.body.should.equal '3.4.5.6'
+    res.body.must_equal '3.4.5.6'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => '10.0.0.1,3.4.5.6'
-    res.body.should.equal '3.4.5.6'
+    res.body.must_equal '3.4.5.6'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => '10.0.0.1, 10.0.0.1, 3.4.5.6'
-    res.body.should.equal '3.4.5.6'
+    res.body.must_equal '3.4.5.6'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => '127.0.0.1, 3.4.5.6'
-    res.body.should.equal '3.4.5.6'
+    res.body.must_equal '3.4.5.6'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => 'unknown,192.168.0.1'
-    res.body.should.equal 'unknown'
+    res.body.must_equal 'unknown'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => 'other,unknown,192.168.0.1'
-    res.body.should.equal 'unknown'
+    res.body.must_equal 'unknown'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => 'unknown,localhost,192.168.0.1'
-    res.body.should.equal 'unknown'
+    res.body.must_equal 'unknown'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => '9.9.9.9, 3.4.5.6, 10.0.0.1, 172.31.4.4'
-    res.body.should.equal '3.4.5.6'
+    res.body.must_equal '3.4.5.6'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => '::1,2620:0:1c00:0:812c:9583:754b:ca11'
-    res.body.should.equal '2620:0:1c00:0:812c:9583:754b:ca11'
+    res.body.must_equal '2620:0:1c00:0:812c:9583:754b:ca11'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => '2620:0:1c00:0:812c:9583:754b:ca11,::1'
-    res.body.should.equal '2620:0:1c00:0:812c:9583:754b:ca11'
+    res.body.must_equal '2620:0:1c00:0:812c:9583:754b:ca11'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => 'fd5b:982e:9130:247f:0000:0000:0000:0000,2620:0:1c00:0:812c:9583:754b:ca11'
-    res.body.should.equal '2620:0:1c00:0:812c:9583:754b:ca11'
+    res.body.must_equal '2620:0:1c00:0:812c:9583:754b:ca11'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => '2620:0:1c00:0:812c:9583:754b:ca11,fd5b:982e:9130:247f:0000:0000:0000:0000'
-    res.body.should.equal '2620:0:1c00:0:812c:9583:754b:ca11'
+    res.body.must_equal '2620:0:1c00:0:812c:9583:754b:ca11'
 
     res = mock.get '/',
       'HTTP_X_FORWARDED_FOR' => '1.1.1.1, 127.0.0.1',
       'HTTP_CLIENT_IP' => '1.1.1.1'
-    res.body.should.equal '1.1.1.1'
+    res.body.must_equal '1.1.1.1'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => '8.8.8.8, 9.9.9.9'
-    res.body.should.equal '9.9.9.9'
+    res.body.must_equal '9.9.9.9'
 
     res = mock.get '/', 'HTTP_X_FORWARDED_FOR' => '8.8.8.8, fe80::202:b3ff:fe1e:8329'
-    res.body.should.equal 'fe80::202:b3ff:fe1e:8329'
+    res.body.must_equal 'fe80::202:b3ff:fe1e:8329'
 
     # Unix Sockets
     res = mock.get '/',
       'REMOTE_ADDR' => 'unix',
       'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
-    res.body.should.equal '3.4.5.6'
+    res.body.must_equal '3.4.5.6'
 
     res = mock.get '/',
       'REMOTE_ADDR' => 'unix:/tmp/foo',
       'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
-    res.body.should.equal '3.4.5.6'
+    res.body.must_equal '3.4.5.6'
   end
 
-  should "not allow IP spoofing via Client-IP and X-Forwarded-For headers" do
+  it "not allow IP spoofing via Client-IP and X-Forwarded-For headers" do
     mock = Rack::MockRequest.new(Rack::Lint.new(ip_app))
 
     # IP Spoofing attempt:
@@ -1154,31 +1278,31 @@ EOF
     res = mock.get '/',
       'HTTP_X_FORWARDED_FOR' => '6.6.6.6, 2.2.2.3, 192.168.0.7',
       'HTTP_CLIENT_IP' => '6.6.6.6'
-    res.body.should.equal '2.2.2.3'
-  end
-
-  should "regard local addresses as proxies" do
-    req = Rack::Request.new(Rack::MockRequest.env_for("/"))
-    req.trusted_proxy?('127.0.0.1').should.equal 0
-    req.trusted_proxy?('10.0.0.1').should.equal 0
-    req.trusted_proxy?('172.16.0.1').should.equal 0
-    req.trusted_proxy?('172.20.0.1').should.equal 0
-    req.trusted_proxy?('172.30.0.1').should.equal 0
-    req.trusted_proxy?('172.31.0.1').should.equal 0
-    req.trusted_proxy?('192.168.0.1').should.equal 0
-    req.trusted_proxy?('::1').should.equal 0
-    req.trusted_proxy?('fd00::').should.equal 0
-    req.trusted_proxy?('localhost').should.equal 0
-    req.trusted_proxy?('unix').should.equal 0
-    req.trusted_proxy?('unix:/tmp/sock').should.equal 0
-
-    req.trusted_proxy?("unix.example.org").should.equal nil
-    req.trusted_proxy?("example.org\n127.0.0.1").should.equal nil
-    req.trusted_proxy?("127.0.0.1\nexample.org").should.equal nil
-    req.trusted_proxy?("11.0.0.1").should.equal nil
-    req.trusted_proxy?("172.15.0.1").should.equal nil
-    req.trusted_proxy?("172.32.0.1").should.equal nil
-    req.trusted_proxy?("2001:470:1f0b:18f8::1").should.equal nil
+    res.body.must_equal '2.2.2.3'
+  end
+
+  it "regard local addresses as proxies" do
+    req = make_request(Rack::MockRequest.env_for("/"))
+    req.trusted_proxy?('127.0.0.1').must_equal 0
+    req.trusted_proxy?('10.0.0.1').must_equal 0
+    req.trusted_proxy?('172.16.0.1').must_equal 0
+    req.trusted_proxy?('172.20.0.1').must_equal 0
+    req.trusted_proxy?('172.30.0.1').must_equal 0
+    req.trusted_proxy?('172.31.0.1').must_equal 0
+    req.trusted_proxy?('192.168.0.1').must_equal 0
+    req.trusted_proxy?('::1').must_equal 0
+    req.trusted_proxy?('fd00::').must_equal 0
+    req.trusted_proxy?('localhost').must_equal 0
+    req.trusted_proxy?('unix').must_equal 0
+    req.trusted_proxy?('unix:/tmp/sock').must_equal 0
+
+    req.trusted_proxy?("unix.example.org").must_equal nil
+    req.trusted_proxy?("example.org\n127.0.0.1").must_equal nil
+    req.trusted_proxy?("127.0.0.1\nexample.org").must_equal nil
+    req.trusted_proxy?("11.0.0.1").must_equal nil
+    req.trusted_proxy?("172.15.0.1").must_equal nil
+    req.trusted_proxy?("172.32.0.1").must_equal nil
+    req.trusted_proxy?("2001:470:1f0b:18f8::1").must_equal nil
   end
 
   class MyRequest < Rack::Request
@@ -1187,46 +1311,78 @@ EOF
     end
   end
 
-  should "allow subclass request to be instantiated after parent request" do
+  it "allow subclass request to be instantiated after parent request" do
     env = Rack::MockRequest.env_for("/?foo=bar")
 
-    req1 = Rack::Request.new(env)
-    req1.GET.should.equal "foo" => "bar"
-    req1.params.should.equal "foo" => "bar"
+    req1 = make_request(env)
+    req1.GET.must_equal "foo" => "bar"
+    req1.params.must_equal "foo" => "bar"
 
     req2 = MyRequest.new(env)
-    req2.GET.should.equal "foo" => "bar"
-    req2.params.should.equal :foo => "bar"
+    req2.GET.must_equal "foo" => "bar"
+    req2.params.must_equal :foo => "bar"
   end
 
-  should "allow parent request to be instantiated after subclass request" do
+  it "allow parent request to be instantiated after subclass request" do
     env = Rack::MockRequest.env_for("/?foo=bar")
 
     req1 = MyRequest.new(env)
-    req1.GET.should.equal "foo" => "bar"
-    req1.params.should.equal :foo => "bar"
+    req1.GET.must_equal "foo" => "bar"
+    req1.params.must_equal :foo => "bar"
 
-    req2 = Rack::Request.new(env)
-    req2.GET.should.equal "foo" => "bar"
-    req2.params.should.equal "foo" => "bar"
+    req2 = make_request(env)
+    req2.GET.must_equal "foo" => "bar"
+    req2.params.must_equal "foo" => "bar"
   end
 
-  should "raise TypeError every time if request parameters are broken" do
+  it "raise TypeError every time if request parameters are broken" do
     broken_query = Rack::MockRequest.env_for("/?foo%5B%5D=0&foo%5Bbar%5D=1")
-    req = Rack::Request.new(broken_query)
-    lambda{req.GET}.should.raise(TypeError)
-    lambda{req.params}.should.raise(TypeError)
+    req = make_request(broken_query)
+    lambda{req.GET}.must_raise TypeError
+    lambda{req.params}.must_raise TypeError
   end
 
   (0x20...0x7E).collect { |a|
     b = a.chr
     c = CGI.escape(b)
-    should "not strip '#{a}' => '#{c}' => '#{b}' escaped character from parameters when accessed as string" do
+    it "not strip '#{a}' => '#{c}' => '#{b}' escaped character from parameters when accessed as string" do
       url = "/?foo=#{c}bar#{c}"
       env = Rack::MockRequest.env_for(url)
-      req2 = Rack::Request.new(env)
-      req2.GET.should.equal "foo" => "#{b}bar#{b}"
-      req2.params.should.equal "foo" => "#{b}bar#{b}"
+      req2 = make_request(env)
+      req2.GET.must_equal "foo" => "#{b}bar#{b}"
+      req2.params.must_equal "foo" => "#{b}bar#{b}"
     end
   }
+
+  class NonDelegate < Rack::Request
+    def delegate?; false; end
+  end
+
+  def make_request(env)
+    NonDelegate.new env
+  end
+
+  class TestProxyRequest < RackRequestTest
+    class DelegateRequest
+      include Rack::Request::Helpers
+      extend Forwardable
+
+      def_delegators :@req, :has_header?, :get_header, :fetch_header,
+        :each_header, :set_header, :add_header, :delete_header
+
+      def_delegators :@req, :[], :[]=, :values_at
+
+      def initialize(req)
+        @req = req
+      end
+
+      def delegate?; true; end
+
+      def env; @req.env.dup; end
+    end
+
+    def make_request(env)
+      DelegateRequest.new super(env)
+    end
+  end
 end