rack 1.6.12 → 2.0.7

data/test/spec_builder.rb

@@ -1,7 +1,8 @@
+require 'minitest/autorun'
 require 'rack/builder'
 require 'rack/lint'
 require 'rack/mock'
-require 'rack/showexceptions'
+require 'rack/show_exceptions'
 require 'rack/urlmap'
 
 class NothingMiddleware
@@ -22,11 +23,11 @@ describe Rack::Builder do
   def builder(&block)
     Rack::Lint.new Rack::Builder.new(&block)
   end
-  
+
   def builder_to_app(&block)
     Rack::Lint.new Rack::Builder.new(&block).to_app
   end
-  
+
   it "supports mapping" do
     app = builder_to_app do
       map '/' do |outer_env|
@@ -36,8 +37,8 @@ describe Rack::Builder do
         run lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, ['sub']] }
       end
     end
-    Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'root'
-    Rack::MockRequest.new(app).get("/sub").body.to_s.should.equal 'sub'
+    Rack::MockRequest.new(app).get("/").body.to_s.must_equal 'root'
+    Rack::MockRequest.new(app).get("/sub").body.to_s.must_equal 'sub'
   end
 
   it "doesn't dupe env even when mapping" do
@@ -50,8 +51,8 @@ describe Rack::Builder do
         }
       end
     end
-    Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'root'
-    NothingMiddleware.env['new_key'].should.equal 'new_value'
+    Rack::MockRequest.new(app).get("/").body.to_s.must_equal 'root'
+    NothingMiddleware.env['new_key'].must_equal 'new_value'
   end
 
   it "chains apps by default" do
@@ -60,9 +61,9 @@ describe Rack::Builder do
       run lambda { |env| raise "bzzzt" }
     end
 
-    Rack::MockRequest.new(app).get("/").should.be.server_error
-    Rack::MockRequest.new(app).get("/").should.be.server_error
-    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").must_be :server_error?
+    Rack::MockRequest.new(app).get("/").must_be :server_error?
+    Rack::MockRequest.new(app).get("/").must_be :server_error?
   end
 
   it "has implicit #to_app" do
@@ -71,9 +72,9 @@ describe Rack::Builder do
       run lambda { |env| raise "bzzzt" }
     end
 
-    Rack::MockRequest.new(app).get("/").should.be.server_error
-    Rack::MockRequest.new(app).get("/").should.be.server_error
-    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").must_be :server_error?
+    Rack::MockRequest.new(app).get("/").must_be :server_error?
+    Rack::MockRequest.new(app).get("/").must_be :server_error?
   end
 
   it "supports blocks on use" do
@@ -87,14 +88,14 @@ describe Rack::Builder do
     end
 
     response = Rack::MockRequest.new(app).get("/")
-    response.should.be.client_error
-    response.status.should.equal 401
+    response.must_be :client_error?
+    response.status.must_equal 401
 
     # with auth...
     response = Rack::MockRequest.new(app).get("/",
         'HTTP_AUTHORIZATION' => 'Basic ' + ["joe:secret"].pack("m*"))
-    response.status.should.equal 200
-    response.body.to_s.should.equal 'Hi Boss'
+    response.status.must_equal 200
+    response.body.to_s.must_equal 'Hi Boss'
   end
 
   it "has explicit #to_app" do
@@ -103,9 +104,9 @@ describe Rack::Builder do
       run lambda { |env| raise "bzzzt" }
     end
 
-    Rack::MockRequest.new(app).get("/").should.be.server_error
-    Rack::MockRequest.new(app).get("/").should.be.server_error
-    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").must_be :server_error?
+    Rack::MockRequest.new(app).get("/").must_be :server_error?
+    Rack::MockRequest.new(app).get("/").must_be :server_error?
   end
 
   it "can mix map and run for endpoints" do
@@ -116,8 +117,8 @@ describe Rack::Builder do
       run lambda { |inner_env| [200, {"Content-Type" => "text/plain"}, ['root']] }
     end
 
-    Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'root'
-    Rack::MockRequest.new(app).get("/sub").body.to_s.should.equal 'sub'
+    Rack::MockRequest.new(app).get("/").body.to_s.must_equal 'root'
+    Rack::MockRequest.new(app).get("/sub").body.to_s.must_equal 'sub'
   end
 
   it "accepts middleware-only map blocks" do
@@ -126,8 +127,8 @@ describe Rack::Builder do
       run lambda { |env| raise "bzzzt" }
     end
 
-    proc { Rack::MockRequest.new(app).get("/") }.should.raise(RuntimeError)
-    Rack::MockRequest.new(app).get("/foo").should.be.server_error
+    proc { Rack::MockRequest.new(app).get("/") }.must_raise(RuntimeError)
+    Rack::MockRequest.new(app).get("/foo").must_be :server_error?
   end
 
   it "yields the generated app to a block for warmup" do
@@ -138,10 +139,10 @@ describe Rack::Builder do
       run lambda { |env| [200, {}, []] }
     end.to_app
 
-    warmed_up_app.should.equal app
+    warmed_up_app.must_equal app
   end
 
-  should "initialize apps once" do
+  it "initialize apps once" do
     app = builder do
       class AppClass
         def initialize
@@ -158,8 +159,8 @@ describe Rack::Builder do
       run AppClass.new
     end
 
-    Rack::MockRequest.new(app).get("/").status.should.equal 200
-    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").status.must_equal 200
+    Rack::MockRequest.new(app).get("/").must_be :server_error?
   end
 
   it "allows use after run" do
@@ -168,15 +169,15 @@ describe Rack::Builder do
       use Rack::ShowExceptions
     end
 
-    Rack::MockRequest.new(app).get("/").should.be.server_error
-    Rack::MockRequest.new(app).get("/").should.be.server_error
-    Rack::MockRequest.new(app).get("/").should.be.server_error
+    Rack::MockRequest.new(app).get("/").must_be :server_error?
+    Rack::MockRequest.new(app).get("/").must_be :server_error?
+    Rack::MockRequest.new(app).get("/").must_be :server_error?
   end
 
   it 'complains about a missing run' do
     proc do
       Rack::Lint.new Rack::Builder.app { use Rack::ShowExceptions }
-    end.should.raise(RuntimeError)
+    end.must_raise(RuntimeError)
   end
 
   describe "parse_file" do
@@ -186,38 +187,47 @@ describe Rack::Builder do
 
     it "parses commented options" do
       app, options = Rack::Builder.parse_file config_file('options.ru')
-      options[:debug].should.be.true
-      Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
+      options[:debug].must_equal true
+      options[:environment].must_equal 'test'
+      options[:Port].must_equal '2929'
+      Rack::MockRequest.new(app).get("/").body.to_s.must_equal 'OK'
     end
 
     it "removes __END__ before evaluating app" do
       app, _ = Rack::Builder.parse_file config_file('end.ru')
-      Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
+      Rack::MockRequest.new(app).get("/").body.to_s.must_equal 'OK'
     end
 
     it "supports multi-line comments" do
-      lambda {
-        Rack::Builder.parse_file config_file('comment.ru')
-      }.should.not.raise(SyntaxError)
+      proc, env = Rack::Builder.parse_file(config_file('comment.ru'))
+      proc.must_be_kind_of Proc
+      env.must_equal({})
     end
 
     it "requires anything not ending in .ru" do
       $: << File.dirname(__FILE__)
       app, * = Rack::Builder.parse_file 'builder/anything'
-      Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
+      Rack::MockRequest.new(app).get("/").body.to_s.must_equal 'OK'
+      $:.pop
+    end
+
+    it 'requires an_underscore_app not ending in .ru' do
+      $: << File.dirname(__FILE__)
+      app, * = Rack::Builder.parse_file 'builder/an_underscore_app'
+      Rack::MockRequest.new(app).get('/').body.to_s.must_equal 'OK'
       $:.pop
     end
 
     it "sets __LINE__ correctly" do
       app, _ = Rack::Builder.parse_file config_file('line.ru')
-      Rack::MockRequest.new(app).get("/").body.to_s.should.equal '1'
+      Rack::MockRequest.new(app).get("/").body.to_s.must_equal '1'
     end
   end
 
   describe 'new_from_string' do
     it "builds a rack app from string" do
       app, = Rack::Builder.new_from_string "run lambda{|env| [200, {'Content-Type' => 'text/plane'}, ['OK']] }"
-      Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
+      Rack::MockRequest.new(app).get("/").body.to_s.must_equal 'OK'
     end
   end
 end

data/test/spec_cascade.rb

@@ -1,3 +1,5 @@
+require 'minitest/autorun'
+require 'rack'
 require 'rack/cascade'
 require 'rack/file'
 require 'rack/lint'
@@ -8,7 +10,7 @@ describe Rack::Cascade do
   def cascade(*args)
     Rack::Lint.new Rack::Cascade.new(*args)
   end
-  
+
   docroot = File.expand_path(File.dirname(__FILE__))
   app1 = Rack::File.new(docroot)
 
@@ -17,45 +19,45 @@ describe Rack::Cascade do
   app3 = Rack::URLMap.new("/foo" => lambda { |env|
                             [200, { "Content-Type" => "text/plain"}, [""]]})
 
-  should "dispatch onward on 404 and 405 by default" do
+  it "dispatch onward on 404 and 405 by default" do
     cascade = cascade([app1, app2, app3])
-    Rack::MockRequest.new(cascade).get("/cgi/test").should.be.ok
-    Rack::MockRequest.new(cascade).get("/foo").should.be.ok
-    Rack::MockRequest.new(cascade).get("/toobad").should.be.not_found
-    Rack::MockRequest.new(cascade).get("/cgi/../..").should.be.client_error
+    Rack::MockRequest.new(cascade).get("/cgi/test").must_be :ok?
+    Rack::MockRequest.new(cascade).get("/foo").must_be :ok?
+    Rack::MockRequest.new(cascade).get("/toobad").must_be :not_found?
+    Rack::MockRequest.new(cascade).get("/cgi/../..").must_be :client_error?
 
     # Put is not allowed by Rack::File so it'll 405.
-    Rack::MockRequest.new(cascade).put("/foo").should.be.ok
+    Rack::MockRequest.new(cascade).put("/foo").must_be :ok?
   end
 
-  should "dispatch onward on whatever is passed" do
+  it "dispatch onward on whatever is passed" do
     cascade = cascade([app1, app2, app3], [404, 403])
-    Rack::MockRequest.new(cascade).get("/cgi/../bla").should.be.not_found
+    Rack::MockRequest.new(cascade).get("/cgi/../bla").must_be :not_found?
   end
 
-  should "return 404 if empty" do
-    Rack::MockRequest.new(cascade([])).get('/').should.be.not_found
+  it "return 404 if empty" do
+    Rack::MockRequest.new(cascade([])).get('/').must_be :not_found?
   end
 
-  should "append new app" do
+  it "append new app" do
     cascade = Rack::Cascade.new([], [404, 403])
-    Rack::MockRequest.new(cascade).get('/').should.be.not_found
+    Rack::MockRequest.new(cascade).get('/').must_be :not_found?
     cascade << app2
-    Rack::MockRequest.new(cascade).get('/cgi/test').should.be.not_found
-    Rack::MockRequest.new(cascade).get('/cgi/../bla').should.be.not_found
+    Rack::MockRequest.new(cascade).get('/cgi/test').must_be :not_found?
+    Rack::MockRequest.new(cascade).get('/cgi/../bla').must_be :not_found?
     cascade << app1
-    Rack::MockRequest.new(cascade).get('/cgi/test').should.be.ok
-    Rack::MockRequest.new(cascade).get('/cgi/../..').should.be.client_error
-    Rack::MockRequest.new(cascade).get('/foo').should.be.not_found
+    Rack::MockRequest.new(cascade).get('/cgi/test').must_be :ok?
+    Rack::MockRequest.new(cascade).get('/cgi/../..').must_be :client_error?
+    Rack::MockRequest.new(cascade).get('/foo').must_be :not_found?
     cascade << app3
-    Rack::MockRequest.new(cascade).get('/foo').should.be.ok
+    Rack::MockRequest.new(cascade).get('/foo').must_be :ok?
   end
 
-  should "close the body on cascade" do
+  it "close the body on cascade" do
     body = StringIO.new
     closer = lambda { |env| [404, {}, body] }
     cascade = Rack::Cascade.new([closer, app3], [404])
-    Rack::MockRequest.new(cascade).get("/foo").should.be.ok
-    body.should.be.closed
+    Rack::MockRequest.new(cascade).get("/foo").must_be :ok?
+    body.must_be :closed?
   end
 end

data/test/spec_cgi.rb

@@ -1,102 +1,84 @@
-begin
+require 'helper'
+
+if defined? LIGHTTPD_PID
+
 require File.expand_path('../testrequest', __FILE__)
 require 'rack/handler/cgi'
 
 describe Rack::Handler::CGI do
-  extend TestRequest::Helpers
+  include TestRequest::Helpers
 
-  @host = '127.0.0.1'
-  @port = 9203
+  before do
+    @host = '127.0.0.1'
+    @port = 9203
+  end
 
   if `which lighttpd` && !$?.success?
     raise "lighttpd not found"
   end
 
-  # Keep this first.
-  $pid = fork {
-    ENV['RACK_ENV'] = 'deployment'
-    ENV['RUBYLIB'] = [
-      File.expand_path('../../lib', __FILE__),
-      ENV['RUBYLIB'],
-    ].compact.join(':')
-
-    Dir.chdir(File.expand_path("../cgi", __FILE__)) do
-      exec "lighttpd -D -f lighttpd.conf"
-    end
-  }
-
-  should "respond" do
+  it "respond" do
     sleep 1
     GET("/test")
-    response.should.not.be.nil
+    response.wont_be :nil?
   end
 
-  should "be a lighttpd" do
+  it "be a lighttpd" do
     GET("/test")
-    status.should.equal 200
-    response["SERVER_SOFTWARE"].should =~ /lighttpd/
-    response["HTTP_VERSION"].should.equal "HTTP/1.1"
-    response["SERVER_PROTOCOL"].should.equal "HTTP/1.1"
-    response["SERVER_PORT"].should.equal @port.to_s
-    response["SERVER_NAME"].should.equal @host
+    status.must_equal 200
+    response["SERVER_SOFTWARE"].must_match(/lighttpd/)
+    response["HTTP_VERSION"].must_equal "HTTP/1.1"
+    response["SERVER_PROTOCOL"].must_equal "HTTP/1.1"
+    response["SERVER_PORT"].must_equal @port.to_s
+    response["SERVER_NAME"].must_equal @host
   end
 
-  should "have rack headers" do
+  it "have rack headers" do
     GET("/test")
-    response["rack.version"].should.equal([1,3])
-    response["rack.multithread"].should.be.false
-    response["rack.multiprocess"].should.be.true
-    response["rack.run_once"].should.be.true
+    response["rack.version"].must_equal [1,3]
+    assert_equal false, response["rack.multithread"]
+    assert_equal true, response["rack.multiprocess"]
+    assert_equal true, response["rack.run_once"]
   end
 
-  should "have CGI headers on GET" do
+  it "have CGI headers on GET" do
     GET("/test")
-    response["REQUEST_METHOD"].should.equal "GET"
-    response["SCRIPT_NAME"].should.equal "/test"
-    response["REQUEST_PATH"].should.equal "/"
-    response["PATH_INFO"].should.be.nil
-    response["QUERY_STRING"].should.equal ""
-    response["test.postdata"].should.equal ""
+    response["REQUEST_METHOD"].must_equal "GET"
+    response["SCRIPT_NAME"].must_equal "/test"
+    response["REQUEST_PATH"].must_equal "/"
+    response["PATH_INFO"].must_be_nil
+    response["QUERY_STRING"].must_equal ""
+    response["test.postdata"].must_equal ""
 
     GET("/test/foo?quux=1")
-    response["REQUEST_METHOD"].should.equal "GET"
-    response["SCRIPT_NAME"].should.equal "/test"
-    response["REQUEST_PATH"].should.equal "/"
-    response["PATH_INFO"].should.equal "/foo"
-    response["QUERY_STRING"].should.equal "quux=1"
+    response["REQUEST_METHOD"].must_equal "GET"
+    response["SCRIPT_NAME"].must_equal "/test"
+    response["REQUEST_PATH"].must_equal "/"
+    response["PATH_INFO"].must_equal "/foo"
+    response["QUERY_STRING"].must_equal "quux=1"
   end
 
-  should "have CGI headers on POST" do
+  it "have CGI headers on POST" do
     POST("/test", {"rack-form-data" => "23"}, {'X-test-header' => '42'})
-    status.should.equal 200
-    response["REQUEST_METHOD"].should.equal "POST"
-    response["SCRIPT_NAME"].should.equal "/test"
-    response["REQUEST_PATH"].should.equal "/"
-    response["QUERY_STRING"].should.equal ""
-    response["HTTP_X_TEST_HEADER"].should.equal "42"
-    response["test.postdata"].should.equal "rack-form-data=23"
+    status.must_equal 200
+    response["REQUEST_METHOD"].must_equal "POST"
+    response["SCRIPT_NAME"].must_equal "/test"
+    response["REQUEST_PATH"].must_equal "/"
+    response["QUERY_STRING"].must_equal ""
+    response["HTTP_X_TEST_HEADER"].must_equal "42"
+    response["test.postdata"].must_equal "rack-form-data=23"
   end
 
-  should "support HTTP auth" do
+  it "support HTTP auth" do
     GET("/test", {:user => "ruth", :passwd => "secret"})
-    response["HTTP_AUTHORIZATION"].should.equal "Basic cnV0aDpzZWNyZXQ="
+    response["HTTP_AUTHORIZATION"].must_equal "Basic cnV0aDpzZWNyZXQ="
   end
 
-  should "set status" do
+  it "set status" do
     GET("/test?secret")
-    status.should.equal 403
-    response["rack.url_scheme"].should.equal "http"
-  end
-
-  # Keep this last.
-  should "shutdown" do
-    Process.kill 15, $pid
-    Process.wait($pid).should == $pid
+    status.must_equal 403
+    response["rack.url_scheme"].must_equal "http"
   end
 end
 
-rescue RuntimeError
-  $stderr.puts "Skipping Rack::Handler::CGI tests (lighttpd is required). Install lighttpd and try again."
-rescue NotImplementedError
-  $stderr.puts "Your Ruby implemenation or platform does not support fork. Skipping Rack::Handler::CGI tests."
-end
+end # if defined? LIGHTTPD_PID