Merge branch 'master' of github.com:sinatra/sinatra

test/delegator_test.rb

@@ -100,7 +100,7 @@ class DelegatorTest < Test::Unit::TestCase
     assert_equal ["helpers", mixin.to_s], app.last_call
   end
 
-  it "registers helpers with the delegation target" do
+  it "registers middleware with the delegation target" do
     app, mixin = mirror, Module.new
     Sinatra.use mixin
     assert_equal ["use", mixin.to_s], app.last_call

test/filter_test.rb

@@ -156,11 +156,11 @@ class BeforeFilterTest < Test::Unit::TestCase
 end
 
 class AfterFilterTest < Test::Unit::TestCase
-  it "executes filters in the order defined" do
+  it "executes before and after filters in correct order" do
     invoked = 0
     mock_app do
       before   { invoked = 2 }
-      get('/') { invoked += 2 }
+      get('/') { invoked += 2; 'hello' }
       after    { invoked *= 2 }
     end
 
@@ -410,7 +410,7 @@ class AfterFilterTest < Test::Unit::TestCase
     assert ran
   end
 
-  it 'is possible to apply user_agent conditions to before filters with a path' do
+  it 'is possible to apply user_agent conditions to after filters with a path' do
     ran = false
     mock_app do
       after('/foo', :user_agent => /foo/) { ran = true }

test/helpers_test.rb

@@ -31,12 +31,12 @@ class HelpersTest < Test::Unit::TestCase
       assert_body 'true'
     end
 
-    it 'is false for status > 404' do
+    it 'is false for status gt 404' do
       status_app(405) { not_found? }
       assert_body 'false'
     end
 
-    it 'is false for status < 404' do
+    it 'is false for status lt 404' do
       status_app(403) { not_found? }
       assert_body 'false'
     end
@@ -601,7 +601,7 @@ class HelpersTest < Test::Unit::TestCase
       assert_equal '<sinatra></sinatra>', body   
     end
     
-    it 'sets the Content-Type response header without extname' do
+    it 'sets the Content-Type response header with extname' do
       mock_app do
         get('/attachment') do
           content_type :atom
@@ -812,12 +812,12 @@ class HelpersTest < Test::Unit::TestCase
       assert_not_nil response['Expires']
     end
 
-    it 'allows passing time objects' do
+    it 'allows passing Time.now objects' do
       get '/bar'
       assert_not_nil response['Expires']
     end
 
-    it 'allows passing time objects' do
+    it 'allows passing Time.at objects' do
       get '/baz'
       assert_equal 'Thu, 01 Jan 1970 00:00:00 GMT', response['Expires']
     end