spec_recursive.rb in rack-2.0.0.alpha

- old
+ new

@@ -1,10 +1,12 @@
+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"]
     res["X-Query-String"] = env["QUERY_STRING"]
     res.finish do |inner_res|
@@ -27,46 +29,47 @@
   }
 
   @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