roda 2.2.0 → 2.3.0

data/spec/plugin/slash_path_empty_spec.rb

@@ -8,15 +8,15 @@ describe "slash_path_empty" do
       r.get("b"){"3"}
     end
 
-    body("").should == '1'
-    body.should == '1'
-    body("a").should == ''
-    body("/a").should == '2'
-    body("/a/").should == '2'
-    body("/a/b").should == ''
-    body("b").should == ''
-    body("/b").should == '3'
-    body("/b/").should == '3'
-    body("/b/c").should == ''
+    body("").must_equal '1'
+    body.must_equal '1'
+    body("a").must_equal ''
+    body("/a").must_equal '2'
+    body("/a/").must_equal '2'
+    body("/a/b").must_equal ''
+    body("b").must_equal ''
+    body("/b").must_equal '3'
+    body("/b/").must_equal '3'
+    body("/b/c").must_equal ''
   end
 end

data/spec/plugin/static_spec.rb

@@ -10,8 +10,8 @@ describe "static plugin" do
       end
     end
 
-    body.should == 'a'
-    body('/about/_test.erb').should == File.read('spec/views/about/_test.erb')
+    body.must_equal 'a'
+    body('/about/_test.erb').must_equal File.read('spec/views/about/_test.erb')
   end
 
   it "respects the application's :root option" do
@@ -24,7 +24,7 @@ describe "static plugin" do
       end
     end
 
-    body.should == 'a'
-    body('/about/_test.erb').should == File.read('spec/views/about/_test.erb')
+    body.must_equal 'a'
+    body('/about/_test.erb').must_equal File.read('spec/views/about/_test.erb')
   end
 end

data/spec/plugin/streaming_spec.rb

@@ -9,9 +9,9 @@ describe "streaming plugin" do
     end
 
     s, h, b = req
-    s.should == 200
-    h.should == {'Content-Type'=>'text/html'}
-    b.to_a.should == %w'a b c'
+    s.must_equal 200
+    h.must_equal('Content-Type'=>'text/html')
+    b.to_a.must_equal %w'a b c'
   end
 
   it "should handle errors when streaming, and run callbacks" do
@@ -25,11 +25,11 @@ describe "streaming plugin" do
     end
 
     s, h, b = req
-    s.should == 200
-    h.should == {'Content-Type'=>'text/html'}
+    s.must_equal 200
+    h.must_equal('Content-Type'=>'text/html')
     b.callback{a << 'd'}
-    proc{b.each{|v| a << v}}.should raise_error(Roda::RodaError)
-    a.should == %w'a b e d'
+    proc{b.each{|v| a << v}}.must_raise(Roda::RodaError)
+    a.must_equal %w'a b e d'
   end
 
   it "should handle :loop option to loop" do
@@ -43,10 +43,10 @@ describe "streaming plugin" do
     end
 
     s, h, b = req
-    s.should == 200
-    h.should == {'Content-Type'=>'text/html'}
+    s.must_equal 200
+    h.must_equal('Content-Type'=>'text/html')
     b.callback{a << 'd'}
-    proc{b.each{|v| a << v}}.should raise_error(Roda::RodaError)
-    a.should == %w'a b e d'
+    proc{b.each{|v| a << v}}.must_raise(Roda::RodaError)
+    a.must_equal %w'a b e d'
   end
 end

data/spec/plugin/symbol_matchers_spec.rb

@@ -45,29 +45,29 @@ describe "symbol_matchers plugin" do
       end
     end
 
-    status.should == 404
-    body("/1").should == 'd1'
-    body("/11232135").should == 'd11232135'
-    body("/a").should == 'wa'
-    body("/1az0").should == 'w1az0'
-    body("/f").should == 'ff'
-    body("/foo").should == 'foonil'
-    body("/foo/123").should == 'foo"123"'
-    status("/foo/bar").should == 404
-    status("/foo/123/a").should == 404
-    body("/bar").should == 'barnil'
-    body("/bar/foo").should == 'bar"foo"'
-    status("/bar/foo/baz").should == 404
-    body("/format").should == 'formatnil'
-    body("/format.json").should == 'format"json"'
-    status("/format.").should == 404
-    body("/ffffffffffffffff").should == 'fffffffffffffffff'
-    status("/-").should == 404
-    body("/1/1a/f").should == 'dwf11af'
-    body("/12/1azy/fffff").should == 'dwf121azyfffff'
-    status("/1/f/a").should == 404
-    body("/qa/b/c/d//f/g").should == 'resta/b/c/d//f/g'
-    body('/q').should == 'rest'
-    body('/thing/q').should == 'thingq'
+    status.must_equal 404
+    body("/1").must_equal 'd1'
+    body("/11232135").must_equal 'd11232135'
+    body("/a").must_equal 'wa'
+    body("/1az0").must_equal 'w1az0'
+    body("/f").must_equal 'ff'
+    body("/foo").must_equal 'foonil'
+    body("/foo/123").must_equal 'foo"123"'
+    status("/foo/bar").must_equal 404
+    status("/foo/123/a").must_equal 404
+    body("/bar").must_equal 'barnil'
+    body("/bar/foo").must_equal 'bar"foo"'
+    status("/bar/foo/baz").must_equal 404
+    body("/format").must_equal 'formatnil'
+    body("/format.json").must_equal 'format"json"'
+    status("/format.").must_equal 404
+    body("/ffffffffffffffff").must_equal 'fffffffffffffffff'
+    status("/-").must_equal 404
+    body("/1/1a/f").must_equal 'dwf11af'
+    body("/12/1azy/fffff").must_equal 'dwf121azyfffff'
+    status("/1/f/a").must_equal 404
+    body("/qa/b/c/d//f/g").must_equal 'resta/b/c/d//f/g'
+    body('/q').must_equal 'rest'
+    body('/thing/q').must_equal 'thingq'
   end
 end

data/spec/plugin/symbol_views_spec.rb

@@ -22,11 +22,11 @@ describe "symbol_views plugin" do
   end
 
   it "should call view with the symbol" do
-    body.should == "vsym"
+    body.must_equal "vsym"
   end
 
   it "should not affect other return types" do
-    body("/string").should == 'string'
-    body("/foo").should == ''
+    body("/string").must_equal 'string'
+    body("/foo").must_equal ''
   end
 end

data/spec/plugin/view_options_spec.rb

@@ -32,15 +32,15 @@ describe "view_options plugin view subdirs" do
   end
 
   it "should use set subdir if template name does not contain a slash" do
-    body("/home").strip.should == "<title>Roda: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
+    body("/home").strip.must_equal "<title>Roda: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
   end
 
   it "should not use set subdir if template name contains a slash" do
-    body("/about").strip.should == "<h1>About Roda</h1>"
+    body("/about").strip.must_equal "<h1>About Roda</h1>"
   end
 
   it "should not change behavior when subdir is not set" do
-    body("/path").strip.should == "<h1>Path</h1>"
+    body("/path").strip.must_equal "<h1>Path</h1>"
   end
 end
 
@@ -54,7 +54,7 @@ describe "view_options plugin" do
       view('about')
     end
 
-    body.strip.should == "<title>Alternative Layout: Home</title>\n<h1>About Roda</h1>"
+    body.strip.must_equal "<title>Alternative Layout: Home</title>\n<h1>About Roda</h1>"
   end
 
   it "should merge multiple calls to set view and layout options and locals" do
@@ -72,7 +72,7 @@ describe "view_options plugin" do
       view('multiple')
     end
 
-    body.strip.should == "About Roda:A::Home:B"
+    body.strip.must_equal "About Roda:A::Home:B"
   end
 
   it "should have set_view_locals have more precedence than plugin options, but less than view/render method options" do
@@ -107,11 +107,11 @@ describe "view_options plugin" do
       end
     end
 
-    body('/c').strip.should == "About Roda:A::Home:B"
-    body('/b/a').strip.should == "Roda:AA::About:BB"
-    body('/b').strip.should == "Roda:AAA::About:BBB"
-    body('/a').strip.should == "About Roda:AA::Home:BB"
-    body.strip.should == "About Roda:AAA::Home:BBB"
+    body('/c').strip.must_equal "About Roda:A::Home:B"
+    body('/b/a').strip.must_equal "Roda:AA::About:BB"
+    body('/b').strip.must_equal "Roda:AAA::About:BBB"
+    body('/a').strip.must_equal "About Roda:AA::Home:BB"
+    body.strip.must_equal "About Roda:AAA::Home:BBB"
   end
 end
 end

data/spec/plugin_spec.rb

@@ -57,7 +57,7 @@ describe "plugins" do
       end
     end
 
-    body('/hello').should == 'Foo aDefault'
+    body('/hello').must_equal 'Foo aDefault'
   end
 
   it "should support registering plugins and loading them by symbol" do
@@ -66,6 +66,6 @@ describe "plugins" do
       a
     end
 
-    body.should == '1'
+    body.must_equal '1'
   end
 end

data/spec/redirect_spec.rb

@@ -24,18 +24,18 @@ describe "redirects" do
       end
     end
 
-    status.should == 302
-    header('Location').should == '/hello'
-    body.should == ''
+    status.must_equal 302
+    header('Location').must_equal '/hello'
+    body.must_equal ''
 
-    status("/about").should == 301
-    header('Location', "/about").should == '/hello'
-    body("/about").should == ''
+    status("/about").must_equal 301
+    header('Location', "/about").must_equal '/hello'
+    body("/about").must_equal ''
 
-    status("/foo", 'REQUEST_METHOD'=>'POST').should == 302
-    header('Location', "/foo", 'REQUEST_METHOD'=>'POST').should == '/foo'
-    body("/foo", 'REQUEST_METHOD'=>'POST').should == ''
+    status("/foo", 'REQUEST_METHOD'=>'POST').must_equal 302
+    header('Location', "/foo", 'REQUEST_METHOD'=>'POST').must_equal '/foo'
+    body("/foo", 'REQUEST_METHOD'=>'POST').must_equal ''
 
-    proc{req('/foo')}.should raise_error(Roda::RodaError)
+    proc{req('/foo')}.must_raise(Roda::RodaError)
   end
 end

data/spec/request_spec.rb

@@ -8,7 +8,7 @@ describe "request.path, .remaining_path, and .matched_path" do
       end
     end
 
-    body("/foo/bar").should ==  "/foo/bar:/foo:/bar"
+    body("/foo/bar").must_equal  "/foo/bar:/foo:/bar"
   end
 end
 
@@ -18,7 +18,7 @@ describe "request.halt" do
       r.halt [200, {}, ['foo']]
     end
 
-    body.should ==  "foo"
+    body.must_equal  "foo"
   end
 
   it "should use current response if no argument is given" do
@@ -27,7 +27,7 @@ describe "request.halt" do
       r.halt
     end
 
-    body.should ==  "foo"
+    body.must_equal  "foo"
   end
 end
 
@@ -42,7 +42,7 @@ describe "request.scope" do
       end
     end
 
-    body.should ==  "a"
+    body.must_equal  "a"
   end
 end
 
@@ -58,8 +58,8 @@ describe "request.inspect" do
       end
     end
 
-    body('/a/b').should ==  "#<Foo::RodaRequest GET /a/b>"
-    body('REQUEST_METHOD'=>'POST').should ==  "#<Foo::RodaRequest POST />"
+    body('/a/b').must_equal  "#<Foo::RodaRequest GET /a/b>"
+    body('REQUEST_METHOD'=>'POST').must_equal  "#<Foo::RodaRequest POST />"
   end
 end
 
@@ -69,7 +69,7 @@ describe "TERM.inspect" do
       r.class::TERM.inspect
     end
 
-    body.should ==  "TERM"
+    body.must_equal  "TERM"
   end
 end
 
@@ -80,6 +80,6 @@ describe "roda_class" do
       r.class.roda_class.opts[:a] + r.roda_class.opts[:a]
     end
 
-    body.should ==  "aa"
+    body.must_equal  "aa"
   end
 end

data/spec/response_spec.rb

@@ -7,8 +7,8 @@ describe "response #[] and #[]=" do
       response['foo'] + response.headers['foo']
     end
 
-    header('foo').should == "bar"
-    body.should == 'barbar'
+    header('foo').must_equal "bar"
+    body.must_equal 'barbar'
   end
 end
 
@@ -19,8 +19,8 @@ describe "response #headers and #body" do
       response.write response.body.is_a?(Array)
     end
 
-    header('foo').should == "bar"
-    body.should == 'true'
+    header('foo').must_equal "bar"
+    body.must_equal 'true'
   end
 end
 
@@ -31,7 +31,7 @@ describe "response #write" do
       response.write 'b'
     end
 
-    body.should == 'ab'
+    body.must_equal 'ab'
   end
 end
 
@@ -42,7 +42,7 @@ describe "response #finish" do
       "#{s}#{h['Content-Type']}#{b.length}"
     end
 
-    body.should == '404text/html0'
+    body.must_equal '404text/html0'
   end
 
   it "should set status to 200 if body has been written to" do
@@ -52,17 +52,17 @@ describe "response #finish" do
       response.write "#{s}#{h['Content-Type']}#{b.length}"
     end
 
-    body.should == 'a200text/html1'
+    body.must_equal 'a200text/html1'
   end
 
   it "should set Content-Length header" do
     app do |r|
       response.write 'a'
-      response['Content-Length'].should == nil
+      response['Content-Length'].must_equal nil
       throw :halt, response.finish
     end
 
-    header('Content-Length').should == '1'
+    header('Content-Length').must_equal '1'
   end
 
   it "should not overwrite existing status" do
@@ -72,7 +72,7 @@ describe "response #finish" do
       "#{s}#{h['Content-Type']}#{b.length}"
     end
 
-    body.should == '500text/html0'
+    body.must_equal '500text/html0'
   end
 end
 
@@ -82,7 +82,7 @@ describe "response #finish_with_body" do
       throw :halt, response.finish_with_body(['123'])
     end
 
-    body.should == '123'
+    body.must_equal '123'
   end
 
   it "should set status to 200 if status has not been set" do
@@ -90,17 +90,17 @@ describe "response #finish_with_body" do
       throw :halt, response.finish_with_body([])
     end
 
-    status.should == 200
+    status.must_equal 200
   end
 
   it "should not set Content-Length header" do
     app do |r|
       response.write 'a'
-      response['Content-Length'].should == nil
+      response['Content-Length'].must_equal nil
       throw :halt, response.finish_with_body(['123'])
     end
 
-    header('Content-Length').should == nil
+    header('Content-Length').must_equal nil
   end
 
   it "should not overwrite existing status" do
@@ -109,7 +109,7 @@ describe "response #finish_with_body" do
       throw :halt, response.finish_with_body(['123'])
     end
 
-    status.should == 500
+    status.must_equal 500
   end
 end
 
@@ -124,10 +124,10 @@ describe "response #redirect" do
       end
     end
 
-    status('/a').should == 303
-    status.should == 302
-    header('Location', '/a').should == '/foo'
-    header('Location').should == '/bar'
+    status('/a').must_equal 303
+    status.must_equal 302
+    header('Location', '/a').must_equal '/foo'
+    header('Location').must_equal '/bar'
   end
 end
 
@@ -143,8 +143,8 @@ describe "response #empty?" do
       end
     end
 
-    header('foo', '/a').should == 'true'
-    header('foo').should == 'false'
+    header('foo', '/a').must_equal 'true'
+    header('foo').must_equal 'false'
   end
 end
 
@@ -161,7 +161,7 @@ describe "response #inspect" do
       end
     end
 
-    body.should == '#<Foo::RodaResponse 200 {} []>'
+    body.must_equal '#<Foo::RodaResponse 200 {} []>'
   end
 end
 
@@ -172,6 +172,6 @@ describe "roda_class" do
       response.class.roda_class.opts[:a] + response.roda_class.opts[:a]
     end
 
-    body.should ==  "aa"
+    body.must_equal  "aa"
   end
 end