bmizerany-sinatra 0.9.0 → 0.9.0.2

data/test/helpers_test.rb

@@ -1,10 +1,4 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
-
-class Test::Unit::TestCase
-  include Sinatra::Test
-end
+require File.dirname(__FILE__) + '/helper'
 
 describe 'Sinatra::Helpers' do
   describe '#status' do
@@ -19,7 +13,7 @@ describe 'Sinatra::Helpers' do
 
     it 'sets the response status code' do
       get '/'
-      response.status.should.equal 207
+      assert_equal 207, response.status
     end
   end
 
@@ -32,7 +26,7 @@ describe 'Sinatra::Helpers' do
       }
 
       get '/'
-      body.should.equal 'Hello World'
+      assert_equal 'Hello World', body
     end
 
     it 'takes a String, Array, or other object responding to #each' do
@@ -43,7 +37,7 @@ describe 'Sinatra::Helpers' do
       }
 
       get '/'
-      body.should.equal 'Hello World'
+      assert_equal 'Hello World', body
     end
   end
 
@@ -57,9 +51,9 @@ describe 'Sinatra::Helpers' do
       }
 
       get '/'
-      status.should.equal 302
-      body.should.be.empty
-      response['Location'].should.equal '/foo'
+      assert_equal 302, status
+      assert_equal '', body
+      assert_equal '/foo', response['Location']
     end
 
     it 'uses the code given when specified' do
@@ -71,9 +65,9 @@ describe 'Sinatra::Helpers' do
       }
 
       get '/'
-      status.should.equal 301
-      body.should.be.empty
-      response['Location'].should.equal '/foo'
+      assert_equal 301, status
+      assert_equal '', body
+      assert_equal '/foo', response['Location']
     end
   end
 
@@ -87,8 +81,8 @@ describe 'Sinatra::Helpers' do
       }
 
       get '/'
-      status.should.equal 501
-      body.should.be.empty
+      assert_equal 501, status
+      assert_equal '', body
     end
 
     it 'takes an optional body' do
@@ -100,8 +94,8 @@ describe 'Sinatra::Helpers' do
       }
 
       get '/'
-      status.should.equal 501
-      body.should.equal 'FAIL'
+      assert_equal 501, status
+      assert_equal 'FAIL', body
     end
 
     it 'uses a 500 status code when first argument is a body' do
@@ -113,8 +107,8 @@ describe 'Sinatra::Helpers' do
       }
 
       get '/'
-      status.should.equal 500
-      body.should.equal 'FAIL'
+      assert_equal 500, status
+      assert_equal 'FAIL', body
     end
   end
 
@@ -128,8 +122,8 @@ describe 'Sinatra::Helpers' do
       }
 
       get '/'
-      status.should.equal 404
-      body.should.be.empty
+      assert_equal 404, status
+      assert_equal '', body
     end
   end
 
@@ -142,20 +136,20 @@ describe 'Sinatra::Helpers' do
       }
 
       get '/', :env => { 'rack.session' => { :foo => 'bar' } }
-      body.should.equal 'bar'
+      assert_equal 'bar', body
     end
 
     it 'creates a new session when none provided' do
       mock_app {
         get '/' do
-          session.should.be.empty
+          assert session.empty?
           session[:foo] = 'bar'
           'Hi'
         end
       }
 
       get '/'
-      body.should.equal 'Hi'
+      assert_equal 'Hi', body
     end
   end
 
@@ -163,18 +157,18 @@ describe 'Sinatra::Helpers' do
     include Sinatra::Helpers
     it "looks up media types in Rack's MIME registry" do
       Rack::Mime::MIME_TYPES['.foo'] = 'application/foo'
-      media_type('foo').should.equal 'application/foo'
-      media_type('.foo').should.equal 'application/foo'
-      media_type(:foo).should.equal 'application/foo'
+      assert_equal 'application/foo', media_type('foo')
+      assert_equal 'application/foo', media_type('.foo')
+      assert_equal 'application/foo', media_type(:foo)
     end
     it 'returns nil when given nil' do
-      media_type(nil).should.be.nil
+      assert media_type(nil).nil?
     end
     it 'returns nil when media type not registered' do
-      media_type(:bizzle).should.be.nil
+      assert media_type(:bizzle).nil?
     end
     it 'returns the argument when given a media type string' do
-      media_type('text/plain').should.equal 'text/plain'
+      assert_equal 'text/plain', media_type('text/plain')
     end
   end
 
@@ -188,8 +182,8 @@ describe 'Sinatra::Helpers' do
       }
 
       get '/'
-      response['Content-Type'].should.equal 'text/plain'
-      body.should.equal 'Hello World'
+      assert_equal 'text/plain', response['Content-Type']
+      assert_equal 'Hello World', body
     end
 
     it 'takes media type parameters (like charset=)' do
@@ -201,9 +195,9 @@ describe 'Sinatra::Helpers' do
       }
 
       get '/'
-      should.be.ok
-      response['Content-Type'].should.equal 'text/html;charset=utf-8'
-      body.should.equal "<h1>Hello, World</h1>"
+      assert ok?
+      assert_equal 'text/html;charset=utf-8', response['Content-Type']
+      assert_equal "<h1>Hello, World</h1>", body
     end
 
     it "looks up symbols in Rack's mime types dictionary" do
@@ -216,9 +210,9 @@ describe 'Sinatra::Helpers' do
       }
 
       get '/foo.xml'
-      should.be.ok
-      response['Content-Type'].should.equal 'application/foo'
-      body.should.equal 'I AM FOO'
+      assert ok?
+      assert_equal 'application/foo', response['Content-Type']
+      assert_equal 'I AM FOO', body
     end
 
     it 'fails when no mime type is registered for the argument provided' do
@@ -228,8 +222,7 @@ describe 'Sinatra::Helpers' do
           "I AM FOO"
         end
       }
-
-      lambda { get '/foo.xml' }.should.raise RuntimeError
+      assert_raise(RuntimeError) { get '/foo.xml' }
     end
   end
 
@@ -255,26 +248,26 @@ describe 'Sinatra::Helpers' do
     it "sends the contents of the file" do
       send_file_app
       get '/file.txt'
-      should.be.ok
-      body.should.equal 'Hello World'
+      assert ok?
+      assert_equal 'Hello World', body
     end
 
     it 'sets the Content-Type response header if a mime-type can be located' do
       send_file_app
       get '/file.txt'
-      response['Content-Type'].should.equal 'text/plain'
+      assert_equal 'text/plain', response['Content-Type']
     end
 
     it 'sets the Content-Length response header' do
       send_file_app
       get '/file.txt'
-      response['Content-Length'].should.equal 'Hello World'.length.to_s
+      assert_equal 'Hello World'.length.to_s, response['Content-Length']
     end
 
     it 'sets the Last-Modified response header' do
       send_file_app
       get '/file.txt'
-      response['Last-Modified'].should.equal File.mtime(@file).httpdate
+      assert_equal File.mtime(@file).httpdate, response['Last-Modified']
     end
 
     it "returns a 404 when not found" do
@@ -284,7 +277,7 @@ describe 'Sinatra::Helpers' do
         end
       }
       get '/'
-      should.be.not_found
+      assert not_found?
     end
   end
 
@@ -303,19 +296,19 @@ describe 'Sinatra::Helpers' do
 
     it 'sets the Last-Modified header to a valid RFC 2616 date value' do
       get '/'
-      response['Last-Modified'].should.equal @now.httpdate
+      assert_equal @now.httpdate, response['Last-Modified']
     end
 
     it 'returns a body when conditional get misses' do
       get '/'
-      status.should.be 200
-      body.should.equal 'Boo!'
+      assert_equal 200, status
+      assert_equal 'Boo!', body
     end
 
     it 'halts when a conditional GET matches' do
       get '/', :env => { 'HTTP_IF_MODIFIED_SINCE' => @now.httpdate }
-      status.should.be 304
-      body.should.be.empty
+      assert_equal 304, status
+      assert_equal '', body
     end
   end
 
@@ -332,25 +325,25 @@ describe 'Sinatra::Helpers' do
 
     it 'sets the ETag header' do
       get '/'
-      response['ETag'].should.equal '"FOO"'
+      assert_equal '"FOO"', response['ETag']
     end
 
     it 'returns a body when conditional get misses' do
       get '/'
-      status.should.be 200
-      body.should.equal 'Boo!'
+      assert_equal 200, status
+      assert_equal 'Boo!', body
     end
 
     it 'halts when a conditional GET matches' do
       get '/', :env => { 'HTTP_IF_NONE_MATCH' => '"FOO"' }
-      status.should.be 304
-      body.should.be.empty
+      assert_equal 304, status
+      assert_equal '', body
     end
 
     it 'should handle multiple ETag values in If-None-Match header' do
       get '/', :env => { 'HTTP_IF_NONE_MATCH' => '"BAR", *' }
-      status.should.be 304
-      body.should.be.empty
+      assert_equal 304, status
+      assert_equal '', body
     end
 
     it 'uses a weak etag with the :weak option' do
@@ -361,7 +354,7 @@ describe 'Sinatra::Helpers' do
         end
       }
       get '/'
-      response['ETag'].should.equal 'W/"FOO"'
+      assert_equal 'W/"FOO"', response['ETag']
     end
 
   end

data/test/mapped_error_test.rb

@@ -1,10 +1,6 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe 'Exception Mappings' do
-  include Sinatra::Test
-
   class FooError < RuntimeError
   end
 
@@ -17,8 +13,8 @@ describe 'Exception Mappings' do
       end
     }
     get '/'
-    status.should.equal 500
-    body.should.equal 'Foo!'
+    assert_equal 500, status
+    assert_equal 'Foo!', body
   end
 
   it 'uses the Exception handler if no matching handler found' do
@@ -30,16 +26,16 @@ describe 'Exception Mappings' do
       end
     }
     get '/'
-    status.should.equal 500
-    body.should.equal 'Exception!'
+    assert_equal 500, status
+    assert_equal 'Exception!', body
   end
 
   it "sets env['sinatra.error'] to the rescued exception" do
     mock_app {
       set :raise_errors, false
       error(FooError) {
-        env.should.include 'sinatra.error'
-        env['sinatra.error'].should.be.kind_of FooError
+        assert env.include?('sinatra.error')
+        assert env['sinatra.error'].kind_of?(FooError)
         'looks good'
       }
       get '/' do
@@ -47,7 +43,19 @@ describe 'Exception Mappings' do
       end
     }
     get '/'
-    body.should.equal 'looks good'
+    assert_equal 'looks good', body
+  end
+
+  it 'dumps errors to rack.errors when dump_errors is enabled' do
+    mock_app {
+      set :raise_errors, false
+      set :dump_errors, true
+      get('/') { raise FooError, 'BOOM!' }
+    }
+
+    get '/'
+    assert_equal 500, status
+    assert @response.errors =~ /FooError - BOOM!:/
   end
 
   it "raises without calling the handler when the raise_errors options is set" do
@@ -58,7 +66,7 @@ describe 'Exception Mappings' do
         raise FooError
       end
     }
-    lambda { get '/' }.should.raise FooError
+    assert_raise(FooError) { get '/' }
   end
 
   it "never raises Sinatra::NotFound beyond the application" do
@@ -68,8 +76,8 @@ describe 'Exception Mappings' do
         raise Sinatra::NotFound
       end
     }
-    lambda { get '/' }.should.not.raise Sinatra::NotFound
-    status.should.equal 404
+    assert_nothing_raised { get '/' }
+    assert_equal 404, status
   end
 
   class FooNotFound < Sinatra::NotFound
@@ -83,11 +91,22 @@ describe 'Exception Mappings' do
         raise FooNotFound
       end
     }
-    lambda { get '/' }.should.not.raise FooNotFound
-    status.should.equal 404
-    body.should.equal 'foo! not found.'
+    assert_nothing_raised { get '/' }
+    assert_equal 404, status
+    assert_equal 'foo! not found.', body
   end
 
+  it 'has a not_found method for backwards compatibility' do
+    mock_app {
+      not_found do
+        "Lost, are we?"
+      end
+    }
+
+    get '/test'
+    assert_equal 404, status
+    assert_equal "Lost, are we?", body
+  end
 end
 
 describe 'Custom Error Pages' do
@@ -100,8 +119,8 @@ describe 'Custom Error Pages' do
       end
     }
     get '/'
-    status.should.equal 500
-    body.should.equal 'Foo!'
+    assert_equal 500, status
+    assert_equal 'Foo!', body
   end
 
   it 'allows ranges of status code mappings to be registered with :error' do
@@ -113,8 +132,8 @@ describe 'Custom Error Pages' do
       end
     }
     get '/'
-    status.should.equal 507
-    body.should.equal 'Error: 507'
+    assert_equal 507, status
+    assert_equal 'Error: 507', body
   end
 
   class FooError < RuntimeError
@@ -135,7 +154,7 @@ describe 'Custom Error Pages' do
       end
     }
     get '/'
-    status.should.equal 502
-    body.should.equal 'from custom error page'
+    assert_equal 502, status
+    assert_equal 'from custom error page', body
   end
 end

data/test/middleware_test.rb

@@ -1,10 +1,6 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe "Middleware" do
-  include Sinatra::Test
-
   before do
     @app = mock_app(Sinatra::Default) {
       get '/*' do
@@ -31,8 +27,8 @@ describe "Middleware" do
   it "is added with Sinatra::Application.use" do
     @app.use UpcaseMiddleware
     get '/hello-world'
-    response.should.be.ok
-    body.should.equal '/HELLO-WORLD'
+    assert ok?
+    assert_equal '/HELLO-WORLD', body
   end
 
   class DowncaseMiddleware < MockMiddleware
@@ -46,18 +42,17 @@ describe "Middleware" do
     @app.use UpcaseMiddleware
     @app.use DowncaseMiddleware
     get '/Foo'
-    body.should.equal "/foo"
-    response['X-Tests'].should.equal "UpcaseMiddleware, DowncaseMiddleware"
+    assert_equal "/foo", body
+    assert_equal "UpcaseMiddleware, DowncaseMiddleware", response['X-Tests']
   end
 
   specify "resets the prebuilt pipeline when new middleware is added" do
     @app.use UpcaseMiddleware
     get '/Foo'
-    body.should.equal "/FOO"
+    assert_equal "/FOO", body
     @app.use DowncaseMiddleware
     get '/Foo'
-    body.should.equal '/foo'
-    response['X-Tests'].should.equal "UpcaseMiddleware, DowncaseMiddleware"
+    assert_equal '/foo', body
+    assert_equal "UpcaseMiddleware, DowncaseMiddleware", response['X-Tests']
   end
-
 end

data/test/options_test.rb

@@ -1,33 +1,27 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
 describe 'Options' do
-  include Sinatra::Test
-
-  before do
-    @app = Class.new(Sinatra::Base)
-  end
+  before { @app = Class.new(Sinatra::Base) }
 
   it 'sets options to literal values' do
     @app.set(:foo, 'bar')
-    @app.should.respond_to? :foo
-    @app.foo.should.equal 'bar'
+    assert @app.respond_to?(:foo)
+    assert_equal 'bar', @app.foo
   end
 
   it 'sets options to Procs' do
     @app.set(:foo, Proc.new { 'baz' })
-    @app.should.respond_to? :foo
-    @app.foo.should.equal 'baz'
+    assert @app.respond_to?(:foo)
+    assert_equal 'baz', @app.foo
   end
 
   it "sets multiple options with a Hash" do
     @app.set :foo => 1234,
         :bar => 'Hello World',
         :baz => Proc.new { 'bizzle' }
-    @app.foo.should.equal 1234
-    @app.bar.should.equal 'Hello World'
-    @app.baz.should.equal 'bizzle'
+    assert_equal 1234, @app.foo
+    assert_equal 'Hello World', @app.bar
+    assert_equal 'bizzle', @app.baz
   end
 
   it 'inherits option methods when subclassed' do
@@ -35,10 +29,10 @@ describe 'Options' do
     @app.set :biz, Proc.new { 'baz' }
 
     sub = Class.new(@app)
-    sub.should.respond_to :foo
-    sub.foo.should.equal 'bar'
-    sub.should.respond_to :biz
-    sub.biz.should.equal 'baz'
+    assert sub.respond_to?(:foo)
+    assert_equal 'bar', sub.foo
+    assert sub.respond_to?(:biz)
+    assert_equal 'baz', sub.biz
   end
 
   it 'overrides options in subclass' do
@@ -46,23 +40,23 @@ describe 'Options' do
     @app.set :biz, Proc.new { 'baz' }
     sub = Class.new(@app)
     sub.set :foo, 'bling'
-    sub.foo.should.equal 'bling'
-    @app.foo.should.equal 'bar'
+    assert_equal 'bling', sub.foo
+    assert_equal 'bar', @app.foo
   end
 
   it 'creates setter methods when first defined' do
     @app.set :foo, 'bar'
-    @app.should.respond_to 'foo='
+    assert @app.respond_to?('foo=')
     @app.foo = 'biz'
-    @app.foo.should.equal 'biz'
+    assert_equal 'biz', @app.foo
   end
 
   it 'creates predicate methods when first defined' do
     @app.set :foo, 'hello world'
-    @app.should.respond_to :foo?
-    @app.foo?.should.be true
+    assert @app.respond_to?(:foo?)
+    assert @app.foo?
     @app.set :foo, nil
-    @app.foo?.should.be false
+    assert !@app.foo?
   end
 
   it 'uses existing setter methods if detected' do
@@ -76,28 +70,28 @@ describe 'Options' do
     end
 
     @app.set :foo, 'bam'
-    @app.foo.should.equal 'oops'
+    assert_equal 'oops', @app.foo
   end
 
   it "sets multiple options to true with #enable" do
     @app.enable :sessions, :foo, :bar
-    @app.sessions.should.be true
-    @app.foo.should.be true
-    @app.bar.should.be true
+    assert @app.sessions
+    assert @app.foo
+    assert @app.bar
   end
 
   it "sets multiple options to false with #disable" do
     @app.disable :sessions, :foo, :bar
-    @app.sessions.should.be false
-    @app.foo.should.be false
-    @app.bar.should.be false
+    assert !@app.sessions
+    assert !@app.foo
+    assert !@app.bar
   end
 
   it 'enables MethodOverride middleware when :methodoverride is enabled' do
     @app.set :methodoverride, true
     @app.put('/') { 'okay' }
     post '/', {'_method'=>'PUT'}, {}
-    status.should.equal 200
-    body.should.equal 'okay'
+    assert_equal 200, status
+    assert_equal 'okay', body
   end
 end