roda 2.2.0 → 2.3.0

data/spec/plugin/backtracking_array_spec.rb

@@ -17,24 +17,24 @@ describe "backtracking_array plugin" do
     end
 
     tests = lambda do
-      status.should == 404
-
-      body("/a").should == 'a'
-      body("/a/b").should == 'a/b'
-      status("/a/b/").should == 404
-
-      body("/c/d").should == 'c-d'
-      body("/c/e").should == 'c-e'
-      body("/c/d/d").should == 'c/d-d'
-      body("/c/d/e").should == 'c/d-e'
-      status("/c/d/").should == 404
-
-      body("/f").should == 'f'
-      body("/f/g").should == 'f/g'
-      body("/g").should == 'g'
-      body("/g/h").should == 'g/h'
-      status("/f/g/").should == 404
-      status("/g/h/").should == 404
+      status.must_equal 404
+
+      body("/a").must_equal 'a'
+      body("/a/b").must_equal 'a/b'
+      status("/a/b/").must_equal 404
+
+      body("/c/d").must_equal 'c-d'
+      body("/c/e").must_equal 'c-e'
+      body("/c/d/d").must_equal 'c/d-d'
+      body("/c/d/e").must_equal 'c/d-e'
+      status("/c/d/").must_equal 404
+
+      body("/f").must_equal 'f'
+      body("/f/g").must_equal 'f/g'
+      body("/g").must_equal 'g'
+      body("/g/h").must_equal 'g/h'
+      status("/f/g/").must_equal 404
+      status("/g/h/").must_equal 404
     end
 
     tests.call

data/spec/plugin/caching_spec.rb

@@ -5,14 +5,14 @@ describe 'response.cache_control' do
     app(:caching) do |r|
       response.cache_control :public=>true, :no_cache=>true, :max_age => 60
     end
-    header('Cache-Control').split(', ').sort.should == ['max-age=60', 'no-cache', 'public']
+    header('Cache-Control').split(', ').sort.must_equal ['max-age=60', 'no-cache', 'public']
   end
 
   it 'does not add a Cache-Control header if it would be empty' do
     app(:caching) do |r|
       response.cache_control({})
     end
-    header('Cache-Control').should == nil
+    header('Cache-Control').must_equal nil
   end
 end
 
@@ -21,16 +21,16 @@ describe 'response.expires' do
     app(:caching) do |r|
       response.expires 60, :public=>true, :no_cache=>true
     end
-    header('Cache-Control').split(', ').sort.should == ['max-age=60', 'no-cache', 'public']
-    ((Time.httpdate(header('Expires')) - Time.now).round - 60).abs.should <= 1
+    header('Cache-Control').split(', ').sort.must_equal ['max-age=60', 'no-cache', 'public']
+    ((Time.httpdate(header('Expires')) - Time.now).round - 60).abs.must_be :<=, 1
   end
 
   it 'can be called with only one argument' do
     app(:caching) do |r|
       response.expires 60
     end
-    header('Cache-Control').split(', ').sort.should == ['max-age=60']
-    ((Time.httpdate(header('Expires')) - Time.now).round - 60).abs.should <= 1
+    header('Cache-Control').split(', ').sort.must_equal ['max-age=60']
+    ((Time.httpdate(header('Expires')) - Time.now).round - 60).abs.must_be :<=, 1
   end
 end
 
@@ -39,16 +39,16 @@ describe 'response.finish' do
     app(:caching) do |r|
       response.status = 304
     end
-    header('Content-Type').should == nil
-    header('Content-Length').should == nil
+    header('Content-Type').must_equal nil
+    header('Content-Length').must_equal nil
   end
 
   it 'does not change non-304 responses' do
     app(:caching) do |r|
       response.status = 200
     end
-    header('Content-Type').should == 'text/html'
-    header('Content-Length').should == '0'
+    header('Content-Type').must_equal 'text/html'
+    header('Content-Length').must_equal '0'
   end
 end
 
@@ -57,7 +57,7 @@ describe 'request.last_modified' do
     app(:caching) do |r|
       r.last_modified nil
     end
-    header('Last-Modified').should == nil
+    header('Last-Modified').must_equal nil
   end
 
   it 'does not change a status other than 200' do
@@ -65,16 +65,16 @@ describe 'request.last_modified' do
       response.status = 201
       r.last_modified Time.now
     end
-    status.should == 201
-    status('HTTP_IF_MODIFIED_SINCE' => 'Sun, 26 Sep 2030 23:43:52 GMT').should == 201
-    status('HTTP_IF_MODIFIED_SINCE' => 'Sun, 26 Sep 2000 23:43:52 GMT').should == 201
+    status.must_equal 201
+    status('HTTP_IF_MODIFIED_SINCE' => 'Sun, 26 Sep 2030 23:43:52 GMT').must_equal 201
+    status('HTTP_IF_MODIFIED_SINCE' => 'Sun, 26 Sep 2000 23:43:52 GMT').must_equal 201
   end
 end
 
 describe 'request.last_modified' do
   def res(a={})
     s, h, b = req(a)
-    h['Last-Modified'].should == @last_modified.httpdate
+    h['Last-Modified'].must_equal @last_modified.httpdate
     [s, b.join]
   end
 
@@ -87,39 +87,39 @@ describe 'request.last_modified' do
   end
 
   it 'just sets Last-Modified if no If-Modified-Since header' do
-    res.should == [200, 'ok']
+    res.must_equal [200, 'ok']
   end
 
   it 'just sets Last-Modified if bogus If-Modified-Since header' do
-    res('HTTP_IF_MODIFIED_SINCE' => 'a really weird date').should == [200, 'ok']
+    res('HTTP_IF_MODIFIED_SINCE' => 'a really weird date').must_equal [200, 'ok']
   end
 
   it 'just sets Last-Modified if modified since If-Modified-Since header' do
-    res('HTTP_IF_MODIFIED_SINCE' => (@last_modified - 1).httpdate).should == [200, 'ok']
+    res('HTTP_IF_MODIFIED_SINCE' => (@last_modified - 1).httpdate).must_equal [200, 'ok']
   end
 
   it 'sets Last-Modified and returns 304 if modified on If-Modified-Since header' do
-    res('HTTP_IF_MODIFIED_SINCE' => @last_modified.httpdate).should == [304, '']
+    res('HTTP_IF_MODIFIED_SINCE' => @last_modified.httpdate).must_equal [304, '']
   end
 
   it 'sets Last-Modified and returns 304 if modified before If-Modified-Since header' do
-    res('HTTP_IF_MODIFIED_SINCE' => (@last_modified + 1).httpdate).should == [304, '']
+    res('HTTP_IF_MODIFIED_SINCE' => (@last_modified + 1).httpdate).must_equal [304, '']
   end
 
   it 'sets Last-Modified if If-None-Match header present' do
-    res('HTTP_IF_NONE_MATCH' => '*', 'HTTP_IF_MODIFIED_SINCE' => (@last_modified + 1).httpdate).should == [200, 'ok']
+    res('HTTP_IF_NONE_MATCH' => '*', 'HTTP_IF_MODIFIED_SINCE' => (@last_modified + 1).httpdate).must_equal [200, 'ok']
   end
 
   it 'sets Last-Modified if modified before If-Unmodified-Since header' do
-    res('HTTP_IF_UNMODIFIED_SINCE' => (@last_modified + 1).httpdate).should == [200, 'ok']
+    res('HTTP_IF_UNMODIFIED_SINCE' => (@last_modified + 1).httpdate).must_equal [200, 'ok']
   end
 
   it 'sets Last-Modified if modified on If-Unmodified-Since header' do
-    res('HTTP_IF_UNMODIFIED_SINCE' => @last_modified.httpdate).should == [200, 'ok']
+    res('HTTP_IF_UNMODIFIED_SINCE' => @last_modified.httpdate).must_equal [200, 'ok']
   end
 
   it 'sets Last-Modified and returns 412 if modified after If-Unmodified-Since header' do
-    res('HTTP_IF_UNMODIFIED_SINCE' => (@last_modified - 1).httpdate).should == [412, '']
+    res('HTTP_IF_UNMODIFIED_SINCE' => (@last_modified - 1).httpdate).must_equal [412, '']
   end
 end
 
@@ -138,198 +138,198 @@ describe 'request.etag' do
   end
 
   it 'uses a weak etag with the :weak option' do
-    header('ETag', 'weak'=>true).should == 'W/"foo"'
+    header('ETag', 'weak'=>true).must_equal 'W/"foo"'
   end
 
   describe 'for GET requests' do
     def res(a={})
       s, h, b = req(a)
-      h['ETag'].should == '"foo"'
+      h['ETag'].must_equal '"foo"'
       [s, b.join]
     end
 
     it "sets etag if no If-None-Match" do
-      res.should == [200, 'ok']
+      res.must_equal [200, 'ok']
     end
 
     it "sets etag and returns 304 if If-None-Match is *" do
-      res('HTTP_IF_NONE_MATCH' => '*').should == [304, '']
+      res('HTTP_IF_NONE_MATCH' => '*').must_equal [304, '']
     end
 
     it "sets etag and if If-None-Match is * and it is a new resource" do
-      res('HTTP_IF_NONE_MATCH' => '*', 'new_resource'=>true).should == [200, 'ok']
+      res('HTTP_IF_NONE_MATCH' => '*', 'new_resource'=>true).must_equal [200, 'ok']
     end
 
     it "sets etag and returns 304 if If-None-Match is etag" do
-      res('HTTP_IF_NONE_MATCH' => '"foo"').should == [304, '']
+      res('HTTP_IF_NONE_MATCH' => '"foo"').must_equal [304, '']
     end
 
     it "sets etag and returns 304 if If-None-Match includes etag" do
-      res('HTTP_IF_NONE_MATCH' => '"bar", "foo"').should == [304, '']
+      res('HTTP_IF_NONE_MATCH' => '"bar", "foo"').must_equal [304, '']
     end
 
     it "sets etag if If-None-Match does not include etag" do
-      res('HTTP_IF_NONE_MATCH' => '"bar", "baz"').should == [200, 'ok']
+      res('HTTP_IF_NONE_MATCH' => '"bar", "baz"').must_equal [200, 'ok']
     end
 
     it "sets etag and does not change status code if status code set and not 2xx or 304 if If-None-Match is etag" do
-      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>499).should == [499, 'ok']
+      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>499).must_equal [499, 'ok']
     end
 
     it "sets etag and returns 304 if status code set to 2xx if If-None-Match is etag" do
-      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>201).should == [304, '']
+      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>201).must_equal [304, '']
     end
 
     it "sets etag and returns 304 if status code is already 304 if If-None-Match is etag" do
-      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>304).should == [304, '']
+      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>304).must_equal [304, '']
     end
 
     it "sets etag if If-Match is *" do
-      res('HTTP_IF_MATCH' => '*').should == [200, 'ok']
+      res('HTTP_IF_MATCH' => '*').must_equal [200, 'ok']
     end
 
     it "sets etag if If-Match is etag" do
-      res('HTTP_IF_MATCH' => '"foo"').should == [200, 'ok']
+      res('HTTP_IF_MATCH' => '"foo"').must_equal [200, 'ok']
     end
 
     it "sets etag if If-Match includes etag" do
-      res('HTTP_IF_MATCH' => '"bar", "foo"').should == [200, 'ok']
+      res('HTTP_IF_MATCH' => '"bar", "foo"').must_equal [200, 'ok']
     end
 
     it "sets etag and returns 412 if If-Match is * for new resources" do
-      res('HTTP_IF_MATCH' => '*', 'new_resource'=>true).should == [412, '']
+      res('HTTP_IF_MATCH' => '*', 'new_resource'=>true).must_equal [412, '']
     end
 
     it "sets etag if If-Match does not include etag" do
-      res('HTTP_IF_MATCH' => '"bar", "baz"', 'new_resource'=>true).should == [412, '']
+      res('HTTP_IF_MATCH' => '"bar", "baz"', 'new_resource'=>true).must_equal [412, '']
     end
   end
 
   describe 'for PUT requests' do
     def res(a={})
       s, h, b = req(a.merge('REQUEST_METHOD'=>'PUT'))
-      h['ETag'].should == '"foo"'
+      h['ETag'].must_equal '"foo"'
       [s, b.join]
     end
 
     it "sets etag if no If-None-Match" do
-      res.should == [200, 'ok']
+      res.must_equal [200, 'ok']
     end
 
     it "sets etag and returns 412 if If-None-Match is *" do
-      res('HTTP_IF_NONE_MATCH' => '*').should == [412, '']
+      res('HTTP_IF_NONE_MATCH' => '*').must_equal [412, '']
     end
 
     it "sets etag and if If-None-Match is * and it is a new resource" do
-      res('HTTP_IF_NONE_MATCH' => '*', 'new_resource'=>true).should == [200, 'ok']
+      res('HTTP_IF_NONE_MATCH' => '*', 'new_resource'=>true).must_equal [200, 'ok']
     end
 
     it "sets etag and returns 412 if If-None-Match is etag" do
-      res('HTTP_IF_NONE_MATCH' => '"foo"').should == [412, '']
+      res('HTTP_IF_NONE_MATCH' => '"foo"').must_equal [412, '']
     end
 
     it "sets etag and returns 412 if If-None-Match includes etag" do
-      res('HTTP_IF_NONE_MATCH' => '"bar", "foo"').should == [412, '']
+      res('HTTP_IF_NONE_MATCH' => '"bar", "foo"').must_equal [412, '']
     end
 
     it "sets etag if If-None-Match does not include etag" do
-      res('HTTP_IF_NONE_MATCH' => '"bar", "baz"').should == [200, 'ok']
+      res('HTTP_IF_NONE_MATCH' => '"bar", "baz"').must_equal [200, 'ok']
     end
 
     it "sets etag and does not change status code if status code set and not 2xx or 304 if If-None-Match is etag" do
-      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>499).should == [499, 'ok']
+      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>499).must_equal [499, 'ok']
     end
 
     it "sets etag and returns 304 if status code set to 2xx if If-None-Match is etag" do
-      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>201).should == [412, '']
+      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>201).must_equal [412, '']
     end
 
     it "sets etag and returns 304 if status code is already 304 if If-None-Match is etag" do
-      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>304).should == [412, '']
+      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>304).must_equal [412, '']
     end
 
     it "sets etag if If-Match is *" do
-      res('HTTP_IF_MATCH' => '*').should == [200, 'ok']
+      res('HTTP_IF_MATCH' => '*').must_equal [200, 'ok']
     end
 
     it "sets etag if If-Match is etag" do
-      res('HTTP_IF_MATCH' => '"foo"').should == [200, 'ok']
+      res('HTTP_IF_MATCH' => '"foo"').must_equal [200, 'ok']
     end
 
     it "sets etag if If-Match includes etag" do
-      res('HTTP_IF_MATCH' => '"bar", "foo"').should == [200, 'ok']
+      res('HTTP_IF_MATCH' => '"bar", "foo"').must_equal [200, 'ok']
     end
 
     it "sets etag and returns 412 if If-Match is * for new resources" do
-      res('HTTP_IF_MATCH' => '*', 'new_resource'=>true).should == [412, '']
+      res('HTTP_IF_MATCH' => '*', 'new_resource'=>true).must_equal [412, '']
     end
 
     it "sets etag if If-Match does not include etag" do
-      res('HTTP_IF_MATCH' => '"bar", "baz"', 'new_resource'=>true).should == [412, '']
+      res('HTTP_IF_MATCH' => '"bar", "baz"', 'new_resource'=>true).must_equal [412, '']
     end
   end
 
   describe 'for POST requests' do
     def res(a={})
       s, h, b = req(a.merge('REQUEST_METHOD'=>'POST'))
-      h['ETag'].should == '"foo"'
+      h['ETag'].must_equal '"foo"'
       [s, b.join]
     end
 
     it "sets etag if no If-None-Match" do
-      res.should == [200, 'ok']
+      res.must_equal [200, 'ok']
     end
 
     it "sets etag and returns 412 if If-None-Match is * and it is not a new resource" do
-      res('HTTP_IF_NONE_MATCH' => '*', 'new_resource'=>false).should == [412, '']
+      res('HTTP_IF_NONE_MATCH' => '*', 'new_resource'=>false).must_equal [412, '']
     end
 
     it "sets etag and if If-None-Match is *" do
-      res('HTTP_IF_NONE_MATCH' => '*').should == [200, 'ok']
+      res('HTTP_IF_NONE_MATCH' => '*').must_equal [200, 'ok']
     end
 
     it "sets etag and returns 412 if If-None-Match is etag" do
-      res('HTTP_IF_NONE_MATCH' => '"foo"').should == [412, '']
+      res('HTTP_IF_NONE_MATCH' => '"foo"').must_equal [412, '']
     end
 
     it "sets etag and returns 412 if If-None-Match includes etag" do
-      res('HTTP_IF_NONE_MATCH' => '"bar", "foo"').should == [412, '']
+      res('HTTP_IF_NONE_MATCH' => '"bar", "foo"').must_equal [412, '']
     end
 
     it "sets etag if If-None-Match does not include etag" do
-      res('HTTP_IF_NONE_MATCH' => '"bar", "baz"').should == [200, 'ok']
+      res('HTTP_IF_NONE_MATCH' => '"bar", "baz"').must_equal [200, 'ok']
     end
 
     it "sets etag and does not change status code if status code set and not 2xx or 304 if If-None-Match is etag" do
-      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>499).should == [499, 'ok']
+      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>499).must_equal [499, 'ok']
     end
 
     it "sets etag and returns 304 if status code set to 2xx if If-None-Match is etag" do
-      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>201).should == [412, '']
+      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>201).must_equal [412, '']
     end
 
     it "sets etag and returns 304 if status code is already 304 if If-None-Match is etag" do
-      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>304).should == [412, '']
+      res('HTTP_IF_NONE_MATCH' => '"foo"', 'status'=>304).must_equal [412, '']
     end
 
     it "sets etag if If-Match is * and this is not a new resource" do
-      res('HTTP_IF_MATCH' => '*', 'new_resource'=>false).should == [200, 'ok']
+      res('HTTP_IF_MATCH' => '*', 'new_resource'=>false).must_equal [200, 'ok']
     end
 
     it "sets etag if If-Match is etag" do
-      res('HTTP_IF_MATCH' => '"foo"').should == [200, 'ok']
+      res('HTTP_IF_MATCH' => '"foo"').must_equal [200, 'ok']
     end
 
     it "sets etag if If-Match includes etag" do
-      res('HTTP_IF_MATCH' => '"bar", "foo"').should == [200, 'ok']
+      res('HTTP_IF_MATCH' => '"bar", "foo"').must_equal [200, 'ok']
     end
 
     it "sets etag and returns 412 if If-Match is * for new resources" do
-      res('HTTP_IF_MATCH' => '*').should == [412, '']
+      res('HTTP_IF_MATCH' => '*').must_equal [412, '']
     end
 
     it "sets etag if If-Match does not include etag" do
-      res('HTTP_IF_MATCH' => '"bar", "baz"', 'new_resource'=>true).should == [412, '']
+      res('HTTP_IF_MATCH' => '"bar", "baz"', 'new_resource'=>true).must_equal [412, '']
     end
   end
 end

data/spec/plugin/chunked_spec.rb

@@ -15,18 +15,18 @@ describe "chunked plugin" do
       chunked(:inline=>'m', :layout=>{:inline=>'h<%= yield %>t'})
     end
 
-    cbody.should == "1\r\nh\r\n1\r\nm\r\n1\r\nt\r\n0\r\n\r\n"
-    body.should == "hmt"
+    cbody.must_equal "1\r\nh\r\n1\r\nm\r\n1\r\nt\r\n0\r\n\r\n"
+    body.must_equal "hmt"
   end
 
   it "hex encodes chunk sizes" do
     m = 'm' * 31
     app(:chunked) do |r|
-      chunked(:inline=>m, :layout=>{:inline=>'h<%= yield %>t'})
+      chunked(:inline=>m.dup, :layout=>{:inline=>'h<%= yield %>t'})
     end
 
-    cbody.should == "1\r\nh\r\n1f\r\n#{m}\r\n1\r\nt\r\n0\r\n\r\n"
-    body.should == "h#{m}t"
+    cbody.must_equal "1\r\nh\r\n1f\r\n#{m}\r\n1\r\nt\r\n0\r\n\r\n"
+    body.must_equal "h#{m}t"
   end
 
   it "accepts a block that is called after layout yielding but before content when streaming" do
@@ -36,8 +36,8 @@ describe "chunked plugin" do
       end
     end
 
-    cbody.should == "2\r\nmh\r\n1\r\nt\r\n0\r\n\r\n"
-    body.should == "hmht"
+    cbody.must_equal "2\r\nmh\r\n1\r\nt\r\n0\r\n\r\n"
+    body.must_equal "hmht"
   end
 
   it "has delay accept block that is called after layout yielding but before content when streaming" do
@@ -51,13 +51,13 @@ describe "chunked plugin" do
       end
     end
 
-    cbody.should == "1\r\nh\r\n4\r\nmhij\r\n1\r\nt\r\n0\r\n\r\n"
-    body.should == "hijmhijt"
+    cbody.must_equal "1\r\nh\r\n4\r\nmhij\r\n1\r\nt\r\n0\r\n\r\n"
+    body.must_equal "hijmhijt"
   end
 
   it "has delay raise if not given a block" do
     app(:chunked){|r| delay}
-    proc{body}.should raise_error(Roda::RodaError)
+    proc{body}.must_raise(Roda::RodaError)
   end
 
   it "works when a layout is not used" do
@@ -65,8 +65,8 @@ describe "chunked plugin" do
       chunked(:inline=>'m', :layout=>nil)
     end
 
-    cbody.should == "1\r\nm\r\n0\r\n\r\n"
-    body.should == "m"
+    cbody.must_equal "1\r\nm\r\n0\r\n\r\n"
+    body.must_equal "m"
   end
 
   it "streams partial template responses if flush is used in content template" do
@@ -74,8 +74,8 @@ describe "chunked plugin" do
       chunked(:inline=>'m<%= flush %>n', :layout=>{:inline=>'h<%= yield %>t'})
     end
 
-    cbody.should == "1\r\nh\r\n1\r\nm\r\n1\r\nn\r\n1\r\nt\r\n0\r\n\r\n"
-    body.should == "hmnt"
+    cbody.must_equal "1\r\nh\r\n1\r\nm\r\n1\r\nn\r\n1\r\nt\r\n0\r\n\r\n"
+    body.must_equal "hmnt"
   end
 
   it "streams partial template responses if flush is used in layout template" do
@@ -83,8 +83,8 @@ describe "chunked plugin" do
       chunked(:inline=>'m', :layout=>{:inline=>'h<%= flush %>i<%= yield %>t'})
     end
 
-    cbody.should == "1\r\nh\r\n1\r\ni\r\n1\r\nm\r\n1\r\nt\r\n0\r\n\r\n"
-    body.should == "himt"
+    cbody.must_equal "1\r\nh\r\n1\r\ni\r\n1\r\nm\r\n1\r\nt\r\n0\r\n\r\n"
+    body.must_equal "himt"
   end
 
   it "does not stream if no_chunk! is used" do
@@ -93,8 +93,8 @@ describe "chunked plugin" do
       chunked(:inline=>'m', :layout=>{:inline=>'h<%= yield %>t'})
     end
 
-    cbody.should == "hmt"
-    body.should == "hmt"
+    cbody.must_equal "hmt"
+    body.must_equal "hmt"
   end
 
   it "streams existing response body before call" do
@@ -103,8 +103,8 @@ describe "chunked plugin" do
       response.write chunked(:inline=>'m', :layout=>{:inline=>'h<%= yield %>t'})
     end
 
-    cbody.should == "1\r\na\r\n1\r\nh\r\n1\r\nm\r\n1\r\nt\r\n0\r\n\r\n"
-    body.should == "ahmt"
+    cbody.must_equal "1\r\na\r\n1\r\nh\r\n1\r\nm\r\n1\r\nt\r\n0\r\n\r\n"
+    body.must_equal "ahmt"
   end
 
   it "should not include Content-Length header even if body is already written to" do
@@ -113,8 +113,8 @@ describe "chunked plugin" do
       response.write chunked(:inline=>'m', :layout=>{:inline=>'h<%= yield %>t'})
     end
 
-    header('Content-Length', 'HTTP_VERSION'=>'HTTP/1.1').should == nil
-    header('Content-Length', 'HTTP_VERSION'=>'HTTP/1.0').should == '4'
+    header('Content-Length', 'HTTP_VERSION'=>'HTTP/1.1').must_equal nil
+    header('Content-Length', 'HTTP_VERSION'=>'HTTP/1.0').must_equal '4'
   end
 
   it "stream template responses for view if :chunk_by_default is used" do
@@ -125,8 +125,8 @@ describe "chunked plugin" do
       end
     end
 
-    cbody.should == "1\r\nh\r\n1\r\nm\r\n1\r\nt\r\n0\r\n\r\n"
-    body.should == "hmt"
+    cbody.must_equal "1\r\nh\r\n1\r\nm\r\n1\r\nt\r\n0\r\n\r\n"
+    body.must_equal "hmt"
   end
 
   it "uses Transfer-Encoding header when chunking" do
@@ -134,8 +134,8 @@ describe "chunked plugin" do
       chunked(:inline=>'m', :layout=>{:inline=>'h<%= yield %>t'})
     end
 
-    header('Transfer-Encoding', 'HTTP_VERSION'=>'HTTP/1.1').should == 'chunked'
-    header('Transfer-Encoding', 'HTTP_VERSION'=>'HTTP/1.0').should == nil
+    header('Transfer-Encoding', 'HTTP_VERSION'=>'HTTP/1.1').must_equal 'chunked'
+    header('Transfer-Encoding', 'HTTP_VERSION'=>'HTTP/1.0').must_equal nil
   end
 
   it "uses given :headers when chunking" do
@@ -146,8 +146,8 @@ describe "chunked plugin" do
       end
     end
 
-    header('Foo', 'HTTP_VERSION'=>'HTTP/1.1').should == 'bar'
-    header('Foo', 'HTTP_VERSION'=>'HTTP/1.0').should == nil
+    header('Foo', 'HTTP_VERSION'=>'HTTP/1.1').must_equal 'bar'
+    header('Foo', 'HTTP_VERSION'=>'HTTP/1.0').must_equal nil
   end
 
   it "handles multiple arguments to chunked" do
@@ -159,8 +159,8 @@ describe "chunked plugin" do
       end
     end
 
-    cbody.should == "1\r\nh\r\nb\r\n<h1>m</h1>\n\r\n1\r\nt\r\n0\r\n\r\n"
-    body.should == "h<h1>m</h1>\nt"
+    cbody.must_equal "1\r\nh\r\nb\r\n<h1>m</h1>\n\r\n1\r\nt\r\n0\r\n\r\n"
+    body.must_equal "h<h1>m</h1>\nt"
   end
 
   it "handles multiple hash arguments to chunked" do
@@ -168,8 +168,8 @@ describe "chunked plugin" do
       chunked({:inline=>'m'}, :layout=>{:inline=>'h<%= yield %>t'})
     end
 
-    cbody.should == "1\r\nh\r\n1\r\nm\r\n1\r\nt\r\n0\r\n\r\n"
-    body.should == "hmt"
+    cbody.must_equal "1\r\nh\r\n1\r\nm\r\n1\r\nt\r\n0\r\n\r\n"
+    body.must_equal "hmt"
   end
 
   it "handles :layout_opts option" do
@@ -177,24 +177,24 @@ describe "chunked plugin" do
       chunked(:inline=>'m', :layout=>{:inline=>'<%= h %><%= yield %>t'}, :layout_opts=>{:locals=>{:h=>'h'}})
     end
 
-    cbody.should == "1\r\nh\r\n1\r\nm\r\n1\r\nt\r\n0\r\n\r\n"
-    body.should == "hmt"
+    cbody.must_equal "1\r\nh\r\n1\r\nm\r\n1\r\nt\r\n0\r\n\r\n"
+    body.must_equal "hmt"
   end
 
   it "uses handle_chunk_error for handling errors when chunking" do
     app(:chunked) do |r|
       chunked(:inline=>'m', :layout=>{:inline=>'h<%= yield %><% raise %>'})
     end
-    proc{cbody}.should raise_error
-    proc{body}.should raise_error
+    proc{cbody}.must_raise RuntimeError
+    proc{body}.must_raise RuntimeError
 
     app.send(:define_method, :handle_chunk_error) do |v|
       @_out_buf = 'e'
       flush
     end
 
-    cbody.should == "1\r\nh\r\n1\r\nm\r\n1\r\ne\r\n0\r\n\r\n"
-    proc{body}.should raise_error
+    cbody.must_equal "1\r\nh\r\n1\r\nm\r\n1\r\ne\r\n0\r\n\r\n"
+    proc{body}.must_raise RuntimeError
   end
 end
 end