roda 2.2.0 → 2.3.0

data/spec/plugin/module_include_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
 
 describe "module_include plugin" do 
-  it "should include given module in request or response class" do
+  it "must_include given module in request or response class" do
     app(:bare) do
       plugin :module_include
       request_module(Module.new{def h; halt response.finish end})
@@ -12,7 +12,7 @@ describe "module_include plugin" do
       end
     end
 
-    req.should == [1, {}, []]
+    req.must_equal [1, {}, []]
   end
 
   it "should accept blocks and turn them into modules" do
@@ -26,7 +26,7 @@ describe "module_include plugin" do
       end
     end
 
-    req.should == [1, {}, []]
+    req.must_equal [1, {}, []]
   end
 
   it "should work if called multiple times with a block" do
@@ -42,7 +42,7 @@ describe "module_include plugin" do
       end
     end
 
-    req.should == [1, {}, []]
+    req.must_equal [1, {}, []]
   end
 
 end

data/spec/plugin/multi_route_spec.rb

@@ -66,72 +66,72 @@ describe "multi_route plugin" do
   end
 
   it "adds named routing support" do
-    body.should == 'get'
-    body('REQUEST_METHOD'=>'POST').should == 'post'
-    body('/a').should == 'geta'
-    body('/a', 'REQUEST_METHOD'=>'POST').should == 'posta'
-    body('/b').should == 'getb'
-    body('/b', 'REQUEST_METHOD'=>'POST').should == 'postb'
-    status('/c').should == 404
-    status('/c', 'REQUEST_METHOD'=>'POST').should == 404
+    body.must_equal 'get'
+    body('REQUEST_METHOD'=>'POST').must_equal 'post'
+    body('/a').must_equal 'geta'
+    body('/a', 'REQUEST_METHOD'=>'POST').must_equal 'posta'
+    body('/b').must_equal 'getb'
+    body('/b', 'REQUEST_METHOD'=>'POST').must_equal 'postb'
+    status('/c').must_equal 404
+    status('/c', 'REQUEST_METHOD'=>'POST').must_equal 404
   end
 
   it "works when freezing the app" do
     app.freeze
-    body.should == 'get'
-    body('REQUEST_METHOD'=>'POST').should == 'post'
-    body('/a').should == 'geta'
-    body('/a', 'REQUEST_METHOD'=>'POST').should == 'posta'
-    body('/b').should == 'getb'
-    body('/b', 'REQUEST_METHOD'=>'POST').should == 'postb'
-    status('/c').should == 404
-    status('/c', 'REQUEST_METHOD'=>'POST').should == 404
-
-    proc{app.route("foo"){}}.should raise_error
+    body.must_equal 'get'
+    body('REQUEST_METHOD'=>'POST').must_equal 'post'
+    body('/a').must_equal 'geta'
+    body('/a', 'REQUEST_METHOD'=>'POST').must_equal 'posta'
+    body('/b').must_equal 'getb'
+    body('/b', 'REQUEST_METHOD'=>'POST').must_equal 'postb'
+    status('/c').must_equal 404
+    status('/c', 'REQUEST_METHOD'=>'POST').must_equal 404
+
+    proc{app.route("foo"){}}.must_raise FrozenError
   end
 
   it "uses multi_route to dispatch to any named route" do
-    status('/foo').should == 404
-    body('/foo/get/').should == 'get'
-    body('/foo/get/a').should == 'geta'
-    body('/foo/post/').should == 'post'
-    body('/foo/post/a').should == 'posta'
-    body('/foo/post/b').should == 'foo'
+    status('/foo').must_equal 404
+    body('/foo/get/').must_equal 'get'
+    body('/foo/get/a').must_equal 'geta'
+    body('/foo/post/').must_equal 'post'
+    body('/foo/post/a').must_equal 'posta'
+    body('/foo/post/b').must_equal 'foo'
   end
 
   it "does not have multi_route match non-String named routes" do
-    body('/foo/p').should == 'p'
-    status('/foo/p/2').should == 404
+    body('/foo/p').must_equal 'p'
+    status('/foo/p/2').must_equal 404
   end
 
   it "has multi_route pick up routes newly added" do
-    body('/foo/get/').should == 'get'
-    status('/foo/delete').should == 404
+    body('/foo/get/').must_equal 'get'
+    status('/foo/delete').must_equal 404
     app.route('delete'){|r| r.on{'delete'}}
-    body('/foo/delete').should == 'delete'
+    body('/foo/delete').must_equal 'delete'
   end
 
   it "makes multi_route match longest route if multiple routes have the same prefix" do
     app.route("post/a"){|r| r.on{"pa2"}}
     app.route("get/a"){|r| r.on{"ga2"}}
-    status('/foo').should == 404
-    body('/foo/get/').should == 'get'
-    body('/foo/get/a').should == 'ga2'
-    body('/foo/post/').should == 'post'
-    body('/foo/post/a').should == 'pa2'
-    body('/foo/post/b').should == 'foo'
+    status('/foo').must_equal 404
+    body('/foo/get/').must_equal 'get'
+    body('/foo/get/a').must_equal 'ga2'
+    body('/foo/post/').must_equal 'post'
+    body('/foo/post/a').must_equal 'pa2'
+    body('/foo/post/b').must_equal 'foo'
   end
 
   it "handles loading the plugin multiple times correctly" do
     app.plugin :multi_route
-    body.should == 'get'
-    body('REQUEST_METHOD'=>'POST').should == 'post'
-    body('/a').should == 'geta'
-    body('/a', 'REQUEST_METHOD'=>'POST').should == 'posta'
-    body('/b').should == 'getb'
-    body('/b', 'REQUEST_METHOD'=>'POST').should == 'postb'
-    status('/c').should == 404
-    status('/c', 'REQUEST_METHOD'=>'POST').should == 404
+    body.must_equal 'get'
+    body('REQUEST_METHOD'=>'POST').must_equal 'post'
+    body('/a').must_equal 'geta'
+    body('/a', 'REQUEST_METHOD'=>'POST').must_equal 'posta'
+    body('/b').must_equal 'getb'
+    body('/b', 'REQUEST_METHOD'=>'POST').must_equal 'postb'
+    status('/c').must_equal 404
+    status('/c', 'REQUEST_METHOD'=>'POST').must_equal 404
   end
 
   it "handles subclassing correctly" do
@@ -153,20 +153,20 @@ describe "multi_route plugin" do
       end
     end
 
-    body.should == 'post'
-    body('REQUEST_METHOD'=>'POST').should == 'get'
-    body('/a').should == 'posta'
-    body('/a', 'REQUEST_METHOD'=>'POST').should == 'geta'
-    body('/b').should == '1b'
-    body('/b', 'REQUEST_METHOD'=>'POST').should == '2b'
-    status('/c').should == 404
-    status('/c', 'REQUEST_METHOD'=>'POST').should == 404
+    body.must_equal 'post'
+    body('REQUEST_METHOD'=>'POST').must_equal 'get'
+    body('/a').must_equal 'posta'
+    body('/a', 'REQUEST_METHOD'=>'POST').must_equal 'geta'
+    body('/b').must_equal '1b'
+    body('/b', 'REQUEST_METHOD'=>'POST').must_equal '2b'
+    status('/c').must_equal 404
+    status('/c', 'REQUEST_METHOD'=>'POST').must_equal 404
   end
 
   it "uses the named route return value in multi_route if no block is given" do
     app.route{|r| r.multi_route}
-    body('/get').should == 'getd'
-    body('/post').should == 'postd'
+    body('/get').must_equal 'getd'
+    body('/post').must_equal 'postd'
   end
 end
 
@@ -176,7 +176,7 @@ describe "multi_route plugin" do
       r.multi_route
       'a'
     end
-    body.should == 'a'
+    body.must_equal 'a'
   end
 end
 
@@ -223,12 +223,12 @@ describe "multi_route plugin" do
       r.on("bar"){r.route("bar")}
     end
 
-    body('/foo').should == 'f'
-    body('/foo/foo').should == 'fff'
-    body('/foo/bar').should == 'ffb'
-    body('/bar').should == 'b'
-    body('/bar/foo').should == 'bbf'
-    body('/bar/bar').should == 'bbb'
+    body('/foo').must_equal 'f'
+    body('/foo/foo').must_equal 'fff'
+    body('/foo/bar').must_equal 'ffb'
+    body('/bar').must_equal 'b'
+    body('/bar/foo').must_equal 'bbf'
+    body('/bar/bar').must_equal 'bbb'
   end
 
   it "handles namespaces in r.multi_route" do
@@ -248,11 +248,11 @@ describe "multi_route plugin" do
       r.multi_route
     end
 
-    body('/foo').should == 'f'
-    body('/foo/foo').should == 'fff'
-    body('/foo/bar').should == 'ffb'
-    body('/bar').should == 'b'
-    body('/bar/foo').should == 'bbf'
-    body('/bar/bar').should == 'bbb'
+    body('/foo').must_equal 'f'
+    body('/foo/foo').must_equal 'fff'
+    body('/foo/bar').must_equal 'ffb'
+    body('/bar').must_equal 'b'
+    body('/bar/foo').must_equal 'bbf'
+    body('/bar/bar').must_equal 'bbb'
   end
 end

data/spec/plugin/multi_run_spec.rb

@@ -9,24 +9,24 @@ describe "multi_run plugin" do
 
     app.run "a", Class.new(Roda).class_eval{route{"a1"}; app}
 
-    body("/a").should == 'a1'
-    body("/b").should == 'c'
-    body("/b/a").should == 'c'
-    body.should == 'c'
+    body("/a").must_equal 'a1'
+    body("/b").must_equal 'c'
+    body("/b/a").must_equal 'c'
+    body.must_equal 'c'
 
     app.run "b", Class.new(Roda).class_eval{route{"b1"}; app}
 
-    body("/a").should == 'a1'
-    body("/b").should == 'b1'
-    body("/b/a").should == 'b1'
-    body.should == 'c'
+    body("/a").must_equal 'a1'
+    body("/b").must_equal 'b1'
+    body("/b/a").must_equal 'b1'
+    body.must_equal 'c'
 
     app.run "b/a", Class.new(Roda).class_eval{route{"b2"}; app}
 
-    body("/a").should == 'a1'
-    body("/b").should == 'b1'
-    body("/b/a").should == 'b2'
-    body.should == 'c'
+    body("/a").must_equal 'a1'
+    body("/b").must_equal 'b1'
+    body("/b/a").must_equal 'b2'
+    body.must_equal 'c'
   end
 
   it "works when freezing the app" do
@@ -40,12 +40,12 @@ describe "multi_run plugin" do
     app.run "b/a", Class.new(Roda).class_eval{route{"b2"}; app}
     app.freeze
 
-    body("/a").should == 'a1'
-    body("/b").should == 'b1'
-    body("/b/a").should == 'b2'
-    body.should == 'c'
+    body("/a").must_equal 'a1'
+    body("/b").must_equal 'b1'
+    body("/b/a").must_equal 'b2'
+    body.must_equal 'c'
 
-    proc{app.run "a", Class.new(Roda).class_eval{route{"a1"}; app}}.should raise_error
+    proc{app.run "a", Class.new(Roda).class_eval{route{"a1"}; app}}.must_raise FrozenError
   end
 
   it "works when subclassing" do
@@ -55,7 +55,7 @@ describe "multi_run plugin" do
     end
 
     app.run "a", Class.new(Roda).class_eval{route{"a1"}; app}
-    body("/a").should == 'a1'
+    body("/a").must_equal 'a1'
 
     a = app
     @app = Class.new(a)
@@ -63,10 +63,10 @@ describe "multi_run plugin" do
     a.run "b", Class.new(Roda).class_eval{route{"b2"}; app}
     app.run "b", Class.new(Roda).class_eval{route{"b1"}; app}
 
-    body("/a").should == 'a1'
-    body("/b").should == 'b1'
+    body("/a").must_equal 'a1'
+    body("/b").must_equal 'b1'
 
     @app = a
-    body("/b").should == 'b2'
+    body("/b").must_equal 'b2'
   end
 end

data/spec/plugin/named_templates_spec.rb

@@ -25,9 +25,9 @@ describe "named_templates plugin" do
       end
     end
 
-    body.should == 'bar13-foo12-baz'
+    body.must_equal 'bar13-foo12-baz'
     @app = Class.new(@app)
-    body.should == 'bar13-foo12-baz'
+    body.must_equal 'bar13-foo12-baz'
   end
 
   it "works when freezing the app" do
@@ -50,9 +50,9 @@ describe "named_templates plugin" do
     end
 
     app.freeze
-    body.should == 'bar13-foo12-baz'
+    body.must_equal 'bar13-foo12-baz'
 
-    proc{app.template(:b){"a"}}.should raise_error
+    proc{app.template(:b){"a"}}.must_raise FrozenError
   end
 
   it "works with the view_subdirs plugin" do
@@ -89,8 +89,8 @@ describe "named_templates plugin" do
       end
     end
 
-    body('/foo').should == 'foo13-foobar12-baz'
-    body('/bar').should == 'bar43-barfoo42-baz'
+    body('/foo').must_equal 'foo13-foobar12-baz'
+    body('/bar').must_equal 'bar43-barfoo42-baz'
   end
 end
 end

data/spec/plugin/not_allowed_spec.rb

@@ -40,27 +40,27 @@ describe "not_allowed plugin" do
       end
     end
 
-    body.should == 'a'
-    status('REQUEST_METHOD'=>'POST').should == 405
-    header('Allow', 'REQUEST_METHOD'=>'POST').should == 'GET'
+    body.must_equal 'a'
+    status('REQUEST_METHOD'=>'POST').must_equal 405
+    header('Allow', 'REQUEST_METHOD'=>'POST').must_equal 'GET'
 
-    body('/b').should == 'b'
-    status('/b', 'REQUEST_METHOD'=>'POST').should == 404
+    body('/b').must_equal 'b'
+    status('/b', 'REQUEST_METHOD'=>'POST').must_equal 404
 
-    body('/d').should == 'd'
-    status('/d', 'REQUEST_METHOD'=>'POST').should == 404
+    body('/d').must_equal 'd'
+    status('/d', 'REQUEST_METHOD'=>'POST').must_equal 404
 
-    body('/e').should == 'e'
-    status('/e', 'REQUEST_METHOD'=>'POST').should == 404
+    body('/e').must_equal 'e'
+    status('/e', 'REQUEST_METHOD'=>'POST').must_equal 404
 
-    body('/q').should == 'q'
-    status('/q', 'REQUEST_METHOD'=>'POST').should == 405
+    body('/q').must_equal 'q'
+    status('/q', 'REQUEST_METHOD'=>'POST').must_equal 405
 
-    body('/c').should == 'cg'
-    body('/c').should == 'cg'
-    body('/c', 'REQUEST_METHOD'=>'POST').should == 'cp'
-    body('/c', 'REQUEST_METHOD'=>'PATCH').should == 'c'
-    status('/c', 'REQUEST_METHOD'=>'PATCH').should == 405
-    header('Allow', '/c', 'REQUEST_METHOD'=>'PATCH').should == 'GET, POST'
+    body('/c').must_equal 'cg'
+    body('/c').must_equal 'cg'
+    body('/c', 'REQUEST_METHOD'=>'POST').must_equal 'cp'
+    body('/c', 'REQUEST_METHOD'=>'PATCH').must_equal 'c'
+    status('/c', 'REQUEST_METHOD'=>'PATCH').must_equal 405
+    header('Allow', '/c', 'REQUEST_METHOD'=>'PATCH').must_equal 'GET, POST'
   end
 end

data/spec/plugin/not_found_spec.rb

@@ -16,10 +16,10 @@ describe "not_found plugin" do
       end
     end
 
-    body.should == 'not found'
-    status.should == 404
-    body("/a").should == 'found'
-    status("/a").should == 200
+    body.must_equal 'not found'
+    status.must_equal 404
+    body("/a").must_equal 'found'
+    status("/a").must_equal 200
   end
 
   it "allows overriding status inside not_found" do
@@ -35,7 +35,7 @@ describe "not_found plugin" do
       end
     end
 
-    status.should == 403
+    status.must_equal 403
   end
 
   it "calculates correct Content-Length" do
@@ -47,7 +47,7 @@ describe "not_found plugin" do
       route{}
     end
 
-    header('Content-Length').should == "1"
+    header('Content-Length').must_equal "1"
   end
 
   it "clears existing headers" do
@@ -63,8 +63,8 @@ describe "not_found plugin" do
       end
     end
 
-    header('Content-Type').should == 'text/html'
-    header('Foo').should == nil
+    header('Content-Type').must_equal 'text/html'
+    header('Foo').must_equal nil
   end
 
   it "does not modify behavior if not_found is not called" do
@@ -74,8 +74,8 @@ describe "not_found plugin" do
       end
     end
 
-    body.should == ''
-    body("/a").should == 'found'
+    body.must_equal ''
+    body("/a").must_equal 'found'
   end
 
   it "can set not_found via the plugin block" do
@@ -91,8 +91,8 @@ describe "not_found plugin" do
       end
     end
 
-    body.should == 'not found'
-    body("/a").should == 'found'
+    body.must_equal 'not found'
+    body("/a").must_equal 'found'
   end
 
   it "does not modify behavior if body is not an array" do
@@ -108,7 +108,7 @@ describe "not_found plugin" do
       end
     end
 
-    body.should == ''
+    body.must_equal ''
   end
 
   it "does not modify behavior if body is not an empty array" do
@@ -123,6 +123,6 @@ describe "not_found plugin" do
       end
     end
 
-    body.should == 'a'
+    body.must_equal 'a'
   end
 end