rack 1.6.13 → 2.0.0.alpha

data/test/spec_chunked.rb

@@ -1,3 +1,4 @@
+require 'minitest/autorun'
 require 'rack/chunked'
 require 'rack/lint'
 require 'rack/mock'
@@ -18,59 +19,60 @@ describe Rack::Chunked do
       env_for('/', 'HTTP_VERSION' => '1.1', 'REQUEST_METHOD' => 'GET')
   end
 
-  should 'chunk responses with no Content-Length' do
+  it 'chunk responses with no Content-Length' do
     app = lambda { |env| [200, {"Content-Type" => "text/plain"}, ['Hello', ' ', 'World!']] }
     response = Rack::MockResponse.new(*chunked(app).call(@env))
-    response.headers.should.not.include 'Content-Length'
-    response.headers['Transfer-Encoding'].should.equal 'chunked'
-    response.body.should.equal "5\r\nHello\r\n1\r\n \r\n6\r\nWorld!\r\n0\r\n\r\n"
+    response.headers.wont_include 'Content-Length'
+    response.headers['Transfer-Encoding'].must_equal 'chunked'
+    response.body.must_equal "5\r\nHello\r\n1\r\n \r\n6\r\nWorld!\r\n0\r\n\r\n"
   end
 
-  should 'chunks empty bodies properly' do
+  it 'chunks empty bodies properly' do
     app = lambda { |env| [200, {"Content-Type" => "text/plain"}, []] }
     response = Rack::MockResponse.new(*chunked(app).call(@env))
-    response.headers.should.not.include 'Content-Length'
-    response.headers['Transfer-Encoding'].should.equal 'chunked'
-    response.body.should.equal "0\r\n\r\n"
+    response.headers.wont_include 'Content-Length'
+    response.headers['Transfer-Encoding'].must_equal 'chunked'
+    response.body.must_equal "0\r\n\r\n"
   end
 
-  should 'chunks encoded bodies properly' do
+  it 'chunks encoded bodies properly' do
     body = ["\uFFFEHello", " ", "World"].map {|t| t.encode("UTF-16LE") }
     app  = lambda { |env| [200, {"Content-Type" => "text/plain"}, body] }
     response = Rack::MockResponse.new(*chunked(app).call(@env))
-    response.headers.should.not.include 'Content-Length'
-    response.headers['Transfer-Encoding'].should.equal 'chunked'
-    response.body.encoding.to_s.should.equal "ASCII-8BIT"
-    response.body.should.equal "c\r\n\xFE\xFFH\x00e\x00l\x00l\x00o\x00\r\n2\r\n \x00\r\na\r\nW\x00o\x00r\x00l\x00d\x00\r\n0\r\n\r\n".force_encoding("BINARY")
-  end if RUBY_VERSION >= "1.9"
+    response.headers.wont_include 'Content-Length'
+    response.headers['Transfer-Encoding'].must_equal 'chunked'
+    response.body.encoding.to_s.must_equal "ASCII-8BIT"
+    response.body.must_equal "c\r\n\xFE\xFFH\x00e\x00l\x00l\x00o\x00\r\n2\r\n \x00\r\na\r\nW\x00o\x00r\x00l\x00d\x00\r\n0\r\n\r\n".force_encoding("BINARY")
+    response.body.must_equal "c\r\n\xFE\xFFH\x00e\x00l\x00l\x00o\x00\r\n2\r\n \x00\r\na\r\nW\x00o\x00r\x00l\x00d\x00\r\n0\r\n\r\n".force_encoding(Encoding::BINARY)
+  end
 
-  should 'not modify response when Content-Length header present' do
+  it 'not modify response when Content-Length header present' do
     app = lambda { |env|
       [200, {"Content-Type" => "text/plain", 'Content-Length'=>'12'}, ['Hello', ' ', 'World!']]
     }
     status, headers, body = chunked(app).call(@env)
-    status.should.equal 200
-    headers.should.not.include 'Transfer-Encoding'
-    headers.should.include 'Content-Length'
-    body.join.should.equal 'Hello World!'
+    status.must_equal 200
+    headers.wont_include 'Transfer-Encoding'
+    headers.must_include 'Content-Length'
+    body.join.must_equal 'Hello World!'
   end
 
-  should 'not modify response when client is HTTP/1.0' do
+  it 'not modify response when client is HTTP/1.0' do
     app = lambda { |env| [200, {"Content-Type" => "text/plain"}, ['Hello', ' ', 'World!']] }
     @env['HTTP_VERSION'] = 'HTTP/1.0'
     status, headers, body = chunked(app).call(@env)
-    status.should.equal 200
-    headers.should.not.include 'Transfer-Encoding'
-    body.join.should.equal 'Hello World!'
+    status.must_equal 200
+    headers.wont_include 'Transfer-Encoding'
+    body.join.must_equal 'Hello World!'
   end
 
-  should 'not modify response when client is ancient, pre-HTTP/1.0' do
+  it 'not modify response when client is ancient, pre-HTTP/1.0' do
     app = lambda { |env| [200, {"Content-Type" => "text/plain"}, ['Hello', ' ', 'World!']] }
     check = lambda do
       status, headers, body = chunked(app).call(@env.dup)
-      status.should.equal 200
-      headers.should.not.include 'Transfer-Encoding'
-      body.join.should.equal 'Hello World!'
+      status.must_equal 200
+      headers.wont_include 'Transfer-Encoding'
+      body.join.must_equal 'Hello World!'
     end
 
     @env.delete('HTTP_VERSION') # unicorn will do this on pre-HTTP/1.0 requests
@@ -80,22 +82,22 @@ describe Rack::Chunked do
     check.call
   end
 
-  should 'not modify response when Transfer-Encoding header already present' do
+  it 'not modify response when Transfer-Encoding header already present' do
     app = lambda { |env|
       [200, {"Content-Type" => "text/plain", 'Transfer-Encoding' => 'identity'}, ['Hello', ' ', 'World!']]
     }
     status, headers, body = chunked(app).call(@env)
-    status.should.equal 200
-    headers['Transfer-Encoding'].should.equal 'identity'
-    body.join.should.equal 'Hello World!'
+    status.must_equal 200
+    headers['Transfer-Encoding'].must_equal 'identity'
+    body.join.must_equal 'Hello World!'
   end
 
   [100, 204, 205, 304].each do |status_code|
-    should "not modify response when status code is #{status_code}" do
+    it "not modify response when status code is #{status_code}" do
       app = lambda { |env| [status_code, {}, []] }
       status, headers, _ = chunked(app).call(@env)
-      status.should.equal status_code
-      headers.should.not.include 'Transfer-Encoding'
+      status.must_equal status_code
+      headers.wont_include 'Transfer-Encoding'
     end
   end
 end

data/test/{spec_commonlogger.rb → spec_common_logger.rb}

@@ -1,4 +1,5 @@
-require 'rack/commonlogger'
+require 'minitest/autorun'
+require 'rack/common_logger'
 require 'rack/lint'
 require 'rack/mock'
 
@@ -21,66 +22,67 @@ describe Rack::CommonLogger do
      {"Content-Type" => "text/html", "Content-Length" => "0"},
      []]}
 
-  should "log to rack.errors by default" do
+  it "log to rack.errors by default" do
     res = Rack::MockRequest.new(Rack::CommonLogger.new(app)).get("/")
 
-    res.errors.should.not.be.empty
-    res.errors.should =~ /"GET \/ " 200 #{length} /
+    res.errors.wont_be :empty?
+    res.errors.must_match(/"GET \/ " 200 #{length} /)
   end
 
-  should "log to anything with +write+" do
+  it "log to anything with +write+" do
     log = StringIO.new
     Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/")
 
-    log.string.should =~ /"GET \/ " 200 #{length} /
+    log.string.must_match(/"GET \/ " 200 #{length} /)
   end
 
-  should "work with standartd library logger" do
+  it "work with standartd library logger" do
     logdev = StringIO.new
     log = Logger.new(logdev)
     Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/")
 
-    logdev.string.should =~ /"GET \/ " 200 #{length} /
+    logdev.string.must_match(/"GET \/ " 200 #{length} /)
   end
 
-  should "log - content length if header is missing" do
+  it "log - content length if header is missing" do
     res = Rack::MockRequest.new(Rack::CommonLogger.new(app_without_length)).get("/")
 
-    res.errors.should.not.be.empty
-    res.errors.should =~ /"GET \/ " 200 - /
+    res.errors.wont_be :empty?
+    res.errors.must_match(/"GET \/ " 200 - /)
   end
 
-  should "log - content length if header is zero" do
+  it "log - content length if header is zero" do
     res = Rack::MockRequest.new(Rack::CommonLogger.new(app_with_zero_length)).get("/")
 
-    res.errors.should.not.be.empty
-    res.errors.should =~ /"GET \/ " 200 - /
+    res.errors.wont_be :empty?
+    res.errors.must_match(/"GET \/ " 200 - /)
   end
 
   def with_mock_time(t = 0)
-    mc = class <<Time; self; end
+    mc = class << Time; self; end
     mc.send :alias_method, :old_now, :now
     mc.send :define_method, :now do
       at(t)
     end
     yield
   ensure
+    mc.send :undef_method, :now
     mc.send :alias_method, :now, :old_now
   end
 
-  should "log in common log format" do
+  it "log in common log format" do
     log = StringIO.new
     with_mock_time do
       Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/")
     end
 
     md = /- - - \[([^\]]+)\] "(\w+) \/ " (\d{3}) \d+ ([\d\.]+)/.match(log.string)
-    md.should.not.equal nil
+    md.wont_equal nil
     time, method, status, duration = *md.captures
-    time.should.equal Time.at(0).strftime("%d/%b/%Y:%H:%M:%S %z")
-    method.should.equal "GET"
-    status.should.equal "200"
-    (0..1).should.include?(duration.to_f)
+    time.must_equal Time.at(0).strftime("%d/%b/%Y:%H:%M:%S %z")
+    method.must_equal "GET"
+    status.must_equal "200"
+    (0..1).must_include duration.to_f
   end
 
   def length

data/test/{spec_conditionalget.rb → spec_conditional_get.rb}

@@ -1,13 +1,14 @@
+require 'minitest/autorun'
 require 'time'
-require 'rack/conditionalget'
+require 'rack/conditional_get'
 require 'rack/mock'
 
 describe Rack::ConditionalGet do
   def conditional_get(app)
     Rack::Lint.new Rack::ConditionalGet.new(app)
   end
-  
-  should "set a 304 status and truncate body when If-Modified-Since hits" do
+
+  it "set a 304 status and truncate body when If-Modified-Since hits" do
     timestamp = Time.now.httpdate
     app = conditional_get(lambda { |env|
       [200, {'Last-Modified'=>timestamp}, ['TEST']] })
@@ -15,33 +16,33 @@ describe Rack::ConditionalGet do
     response = Rack::MockRequest.new(app).
       get("/", 'HTTP_IF_MODIFIED_SINCE' => timestamp)
 
-    response.status.should.equal 304
-    response.body.should.be.empty
+    response.status.must_equal 304
+    response.body.must_be :empty?
   end
 
-  should "set a 304 status and truncate body when If-Modified-Since hits and is higher than current time" do
+  it "set a 304 status and truncate body when If-Modified-Since hits and is higher than current time" do
     app = conditional_get(lambda { |env|
       [200, {'Last-Modified'=>(Time.now - 3600).httpdate}, ['TEST']] })
 
     response = Rack::MockRequest.new(app).
       get("/", 'HTTP_IF_MODIFIED_SINCE' => Time.now.httpdate)
 
-    response.status.should.equal 304
-    response.body.should.be.empty
+    response.status.must_equal 304
+    response.body.must_be :empty?
   end
 
-  should "set a 304 status and truncate body when If-None-Match hits" do
+  it "set a 304 status and truncate body when If-None-Match hits" do
     app = conditional_get(lambda { |env|
-      [200, {'Etag'=>'1234'}, ['TEST']] })
+      [200, {'ETag'=>'1234'}, ['TEST']] })
 
     response = Rack::MockRequest.new(app).
       get("/", 'HTTP_IF_NONE_MATCH' => '1234')
 
-    response.status.should.equal 304
-    response.body.should.be.empty
+    response.status.must_equal 304
+    response.body.must_be :empty?
   end
 
-  should "not set a 304 status if If-Modified-Since hits but Etag does not" do
+  it "not set a 304 status if If-Modified-Since hits but Etag does not" do
     timestamp = Time.now.httpdate
     app = conditional_get(lambda { |env|
       [200, {'Last-Modified'=>timestamp, 'Etag'=>'1234', 'Content-Type' => 'text/plain'}, ['TEST']] })
@@ -49,45 +50,45 @@ describe Rack::ConditionalGet do
     response = Rack::MockRequest.new(app).
       get("/", 'HTTP_IF_MODIFIED_SINCE' => timestamp, 'HTTP_IF_NONE_MATCH' => '4321')
 
-    response.status.should.equal 200
-    response.body.should.equal 'TEST'
+    response.status.must_equal 200
+    response.body.must_equal 'TEST'
   end
 
-  should "set a 304 status and truncate body when both If-None-Match and If-Modified-Since hits" do
+  it "set a 304 status and truncate body when both If-None-Match and If-Modified-Since hits" do
     timestamp = Time.now.httpdate
     app = conditional_get(lambda { |env|
-      [200, {'Last-Modified'=>timestamp, 'Etag'=>'1234'}, ['TEST']] })
+      [200, {'Last-Modified'=>timestamp, 'ETag'=>'1234'}, ['TEST']] })
 
     response = Rack::MockRequest.new(app).
       get("/", 'HTTP_IF_MODIFIED_SINCE' => timestamp, 'HTTP_IF_NONE_MATCH' => '1234')
 
-    response.status.should.equal 304
-    response.body.should.be.empty
+    response.status.must_equal 304
+    response.body.must_be :empty?
   end
 
-  should "not affect non-GET/HEAD requests" do
+  it "not affect non-GET/HEAD requests" do
     app = conditional_get(lambda { |env|
       [200, {'Etag'=>'1234', 'Content-Type' => 'text/plain'}, ['TEST']] })
 
     response = Rack::MockRequest.new(app).
       post("/", 'HTTP_IF_NONE_MATCH' => '1234')
 
-    response.status.should.equal 200
-    response.body.should.equal 'TEST'
+    response.status.must_equal 200
+    response.body.must_equal 'TEST'
   end
 
-  should "not affect non-200 requests" do
+  it "not affect non-200 requests" do
     app = conditional_get(lambda { |env|
       [302, {'Etag'=>'1234', 'Content-Type' => 'text/plain'}, ['TEST']] })
 
     response = Rack::MockRequest.new(app).
       get("/", 'HTTP_IF_NONE_MATCH' => '1234')
 
-    response.status.should.equal 302
-    response.body.should.equal 'TEST'
+    response.status.must_equal 302
+    response.body.must_equal 'TEST'
   end
 
-  should "not affect requests with malformed HTTP_IF_NONE_MATCH" do
+  it "not affect requests with malformed HTTP_IF_NONE_MATCH" do
     bad_timestamp = Time.now.strftime('%Y-%m-%d %H:%M:%S %z')
     app = conditional_get(lambda { |env|
       [200,{'Last-Modified'=>(Time.now - 3600).httpdate, 'Content-Type' => 'text/plain'}, ['TEST']] })
@@ -95,8 +96,8 @@ describe Rack::ConditionalGet do
     response = Rack::MockRequest.new(app).
       get("/", 'HTTP_IF_MODIFIED_SINCE' => bad_timestamp)
 
-    response.status.should.equal 200
-    response.body.should.equal 'TEST'
+    response.status.must_equal 200
+    response.body.must_equal 'TEST'
   end
 
 end

data/test/spec_config.rb

@@ -1,3 +1,4 @@
+require 'minitest/autorun'
 require 'rack/builder'
 require 'rack/config'
 require 'rack/content_length'
@@ -5,7 +6,7 @@ require 'rack/lint'
 require 'rack/mock'
 
 describe Rack::Config do
-  should "accept a block that modifies the environment" do
+  it "accept a block that modifies the environment" do
     app = Rack::Builder.new do
       use Rack::Lint
       use Rack::Config do |env|
@@ -17,6 +18,6 @@ describe Rack::Config do
     end
 
     response = Rack::MockRequest.new(app).get('/')
-    response.body.should.equal('hello')
+    response.body.must_equal 'hello'
   end
 end

data/test/spec_content_length.rb

@@ -1,3 +1,4 @@
+require 'minitest/autorun'
 require 'rack/content_length'
 require 'rack/lint'
 require 'rack/mock'
@@ -11,37 +12,37 @@ describe Rack::ContentLength do
     Rack::MockRequest.env_for
   end
 
-  should "set Content-Length on Array bodies if none is set" do
+  it "set Content-Length on Array bodies if none is set" do
     app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ["Hello, World!"]] }
     response = content_length(app).call(request)
-    response[1]['Content-Length'].should.equal '13'
+    response[1]['Content-Length'].must_equal '13'
   end
 
-  should "not set Content-Length on variable length bodies" do
+  it "not set Content-Length on variable length bodies" do
     body = lambda { "Hello World!" }
     def body.each ; yield call ; end
 
     app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, body] }
     response = content_length(app).call(request)
-    response[1]['Content-Length'].should.be.nil
+    response[1]['Content-Length'].must_be_nil
   end
 
-  should "not change Content-Length if it is already set" do
+  it "not change Content-Length if it is already set" do
     app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'Content-Length' => '1'}, "Hello, World!"] }
     response = content_length(app).call(request)
-    response[1]['Content-Length'].should.equal '1'
+    response[1]['Content-Length'].must_equal '1'
   end
 
-  should "not set Content-Length on 304 responses" do
+  it "not set Content-Length on 304 responses" do
     app = lambda { |env| [304, {}, []] }
     response = content_length(app).call(request)
-    response[1]['Content-Length'].should.equal nil
+    response[1]['Content-Length'].must_equal nil
   end
 
-  should "not set Content-Length when Transfer-Encoding is chunked" do
+  it "not set Content-Length when Transfer-Encoding is chunked" do
     app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'Transfer-Encoding' => 'chunked'}, []] }
     response = content_length(app).call(request)
-    response[1]['Content-Length'].should.equal nil
+    response[1]['Content-Length'].must_equal nil
   end
 
   # Using "Connection: close" for this is fairly contended. It might be useful
@@ -50,10 +51,10 @@ describe Rack::ContentLength do
   # should "not force a Content-Length when Connection:close" do
   #   app = lambda { |env| [200, {'Connection' => 'close'}, []] }
   #   response = content_length(app).call({})
-  #   response[1]['Content-Length'].should.equal nil
+  #   response[1]['Content-Length'].must_equal nil
   # end
 
-  should "close bodies that need to be closed" do
+  it "close bodies that need to be closed" do
     body = Struct.new(:body) do
       attr_reader :closed
       def each; body.join; end
@@ -63,12 +64,12 @@ describe Rack::ContentLength do
 
     app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, body] }
     response = content_length(app).call(request)
-    body.closed.should.equal nil
+    body.closed.must_equal nil
     response[2].close
-    body.closed.should.equal true
+    body.closed.must_equal true
   end
 
-  should "support single-execute bodies" do
+  it "support single-execute bodies" do
     body = Struct.new(:body) do
       def each
         yield body.shift until body.empty?
@@ -79,7 +80,7 @@ describe Rack::ContentLength do
     app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, body] }
     response = content_length(app).call(request)
     expected = %w[one two three]
-    response[1]['Content-Length'].should.equal expected.join.size.to_s
-    response[2].to_enum.to_a.should.equal expected
+    response[1]['Content-Length'].must_equal expected.join.size.to_s
+    response[2].to_enum.to_a.must_equal expected
   end
 end