sinatra 0.9.6 → 1.0.a

data/test/render_backtrace_test.rb

@@ -1,145 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-require 'sass/error'
-
-class RenderBacktraceTest < Test::Unit::TestCase
-  VIEWS = File.dirname(__FILE__) + '/views'
-
-  def assert_raise_at(filename, line, exception = RuntimeError)
-    f, l = nil
-    assert_raise(exception) do
-      begin
-        get('/')
-      rescue => e
-        f, l = e.backtrace.first.split(':')
-        raise
-      end
-    end
-    assert_equal(filename, f, "expected #{exception.name} in #{filename}, was #{f}")
-    assert_equal(line, l.to_i, "expected #{exception.name} in #{filename} at line #{line}, was at line #{l}")
-  end
-
-  def backtrace_app(&block)
-    mock_app {
-      enable :inline_templates
-      set :views, RenderBacktraceTest::VIEWS
-      template :builder_template do
-        'raise "error"'
-      end
-      template :erb_template do
-        '<% raise "error" %>'
-      end
-      template :haml_template do
-        '%h1= raise "error"'
-      end
-      template :sass_template do
-        '+syntax-error'
-      end
-      get '/', &block
-    }
-  end
-
-  it "provides backtrace for Builder template" do
-    backtrace_app { builder :error }
-    assert_raise_at(File.join(VIEWS,'error.builder'), 2)
-  end
-
-  it "provides backtrace for ERB template" do
-    backtrace_app { erb :error }
-    assert_raise_at(File.join(VIEWS,'error.erb'), 2)
-  end
-
-  it "provides backtrace for HAML template" do
-    backtrace_app { haml :error }
-    assert_raise_at(File.join(VIEWS,'error.haml'), 2)
-  end
-
-  it "provides backtrace for Sass template" do
-    backtrace_app { sass :error }
-    assert_raise_at(File.join(VIEWS,'error.sass'), 2, Sass::SyntaxError)
-  end
-
-  it "provides backtrace for ERB template with locals" do
-    backtrace_app { erb :error, {}, :french => true }
-    assert_raise_at(File.join(VIEWS,'error.erb'), 3)
-  end
-
-  it "provides backtrace for HAML template with locals" do
-    backtrace_app { haml :error, {}, :french => true }
-    assert_raise_at(File.join(VIEWS,'error.haml'), 3)
-  end
-
-  it "provides backtrace for inline Builder string" do
-    backtrace_app { builder "raise 'Ack! Thbbbt!'"}
-    assert_raise_at(__FILE__, (__LINE__-1))
-  end
-
-  it "provides backtrace for inline ERB string" do
-    backtrace_app { erb "<% raise 'bidi-bidi-bidi' %>" }
-    assert_raise_at(__FILE__, (__LINE__-1))
-  end
-
-  it "provides backtrace for inline HAML string" do
-    backtrace_app { haml "%h1= raise 'Lions and tigers and bears! Oh, my!'" }
-    assert_raise_at(__FILE__, (__LINE__-1))
-  end
-
-  # it "provides backtrace for inline Sass string" do
-  #   backtrace_app { sass '+buh-bye' }
-  #   assert_raise_at(__FILE__, (__LINE__-1), Sass::SyntaxError)
-  # end
-
-  it "provides backtrace for named Builder template" do
-    backtrace_app { builder :builder_template }
-    assert_raise_at(__FILE__, (__LINE__-68))
-  end
-
-  it "provides backtrace for named ERB template" do
-    backtrace_app { erb :erb_template }
-    assert_raise_at(__FILE__, (__LINE__-70))
-  end
-
-  it "provides backtrace for named HAML template" do
-    backtrace_app { haml :haml_template }
-    assert_raise_at(__FILE__, (__LINE__-72))
-  end
-
-  # it "provides backtrace for named Sass template" do
-  #   backtrace_app { sass :sass_template }
-  #   assert_raise_at(__FILE__, (__LINE__-74), Sass::SyntaxError)
-  # end
-
-  it "provides backtrace for in file Builder template" do
-    backtrace_app { builder :builder_in_file }
-    assert_raise_at(__FILE__, (__LINE__+22))
-  end
-
-  it "provides backtrace for in file ERB template" do
-    backtrace_app { erb :erb_in_file }
-    assert_raise_at(__FILE__, (__LINE__+20))
-  end
-
-  it "provides backtrace for in file HAML template" do
-    backtrace_app { haml :haml_in_file }
-    assert_raise_at(__FILE__, (__LINE__+18))
-  end
-
-  # it "provides backtrace for in file Sass template" do
-  #   backtrace_app { sass :sass_in_file }
-  #   assert_raise_at(__FILE__, (__LINE__+16), Sass::SyntaxError)
-  # end
-end
-
-__END__
-
-@@ builder_in_file
-raise "bif"
-
-@@ erb_in_file
-<% raise "bam" %>
-
-@@ haml_in_file
-%h1= raise "pow"
-
-@@ sass_in_file
-+blam

data/test/test_test.rb

@@ -1,155 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-require 'yaml'
-
-# silence deprecation warning when requiring sinatra/test
-$VERBOSE, v = nil, $VERBOSE
-require 'sinatra/test'
-$VERBOSE = v
-
-class TestTest < Test::Unit::TestCase
-  include Sinatra::Test
-
-  def request
-    YAML.load(body)
-  end
-
-  def request_body
-    request['test.body']
-  end
-
-  def request_params
-    YAML.load(request['test.params'])
-  end
-
-  setup do
-    mock_app {
-      %w[get head post put delete].each { |verb|
-        send(verb, '/') do
-          redirect '/redirected' if params[:redirect]
-          env.update('test.body'   => request.body.read)
-          env.update('test.params' => params.to_yaml)
-          env.to_yaml
-        end
-      }
-
-      get '/redirected' do
-        "you've been redirected"
-      end
-    }
-  end
-
-  it 'allows GET/HEAD/POST/PUT/DELETE' do
-    get '/'
-    assert_equal('GET', request['REQUEST_METHOD'])
-
-    post '/'
-    assert_equal('POST', request['REQUEST_METHOD'])
-
-    put '/'
-    assert_equal('PUT', request['REQUEST_METHOD'])
-
-    delete '/'
-    assert_equal('DELETE', request['REQUEST_METHOD'])
-
-    head '/'
-    assert response.headers['Content-Length'].to_i > 0
-    assert_equal('', body)
-  end
-
-  it 'allows to specify a body' do
-    post '/', '42'
-    assert_equal '42', request_body
-  end
-
-  it 'allows to specify params' do
-    get '/', :foo => 'bar'
-    assert_equal 'bar', request_params['foo']
-
-    post '/', :foo => 'bar'
-    assert_equal 'bar', request_params['foo']
-  end
-
-  it 'supports nested params' do
-    get '/', :foo => { :x => 'y', :chunky => 'bacon' }
-    assert_equal "y", request_params['foo']['x']
-    assert_equal "bacon", request_params['foo']['chunky']
-  end
-
-  it 'provides easy access to response status and body' do
-    get '/'
-    assert_equal 200, status
-    assert body =~ /^---/
-  end
-
-  it 'delegates methods to @response' do
-    get '/'
-    assert ok?
-  end
-
-  it 'follows redirect' do
-    get '/', :redirect => true
-    follow!
-    assert_equal "you've been redirected", body
-  end
-
-  it 'provides sugar for common HTTP headers' do
-    get '/', :env => { :accept => 'text/plain' }
-    assert_equal 'text/plain', request['HTTP_ACCEPT']
-
-    get '/', :env => { :agent => 'TATFT' }
-    assert_equal 'TATFT', request['HTTP_USER_AGENT']
-
-    get '/', :env => { :host => '1.2.3.4' }
-    assert_equal '1.2.3.4', request['HTTP_HOST']
-
-    get '/', :env => { :session => {'foo' => 'bar'} }
-    assert_equal({'foo' => 'bar'}, request['rack.session'])
-
-    get '/', :env => { :cookies => 'foo' }
-    assert_equal 'foo', request['HTTP_COOKIE']
-
-    get '/', :env => { :content_type => 'text/plain' }
-    assert_equal 'text/plain', request['CONTENT_TYPE']
-  end
-
-  it 'allow to test session easily' do
-    app = mock_app(Sinatra::Base) {
-      get '/' do
-        session['foo'] = 'bar'
-        200
-      end
-
-      post '/' do
-        assert_equal 'bar', session['foo']
-        session['foo'] || "blah"
-      end
-    }
-
-    browser = Sinatra::TestHarness.new(app)
-    browser.get '/'
-    browser.post '/', {}, :session => { 'foo' => 'bar' }
-    assert_equal 'bar', browser.response.body
-  end
-
-  it 'yields the request object to the block before invoking the application' do
-    called = false
-    get '/' do |req|
-      called = true
-      assert req.kind_of?(Rack::MockRequest)
-    end
-    assert called
-  end
-
-  it 'sets the environment to :test on include' do
-    Sinatra::Application.set(:environment, :production)
-    Class.new { include Sinatra::Test }
-    assert_equal :test, Sinatra::Application.environment
-  end
-
-  def test_TestHarness
-    session  = Sinatra::TestHarness.new(@app)
-    response = session.get('/')
-    assert_equal 200, response.status
-  end
-end