Permalink
Browse files

set RACK_ENV in test/helper.rb to ensure sane environment

  • Loading branch information...
1 parent 3b9578f commit f3ce6899652af722c69dd6ffdc11829251251e02 @rtomayko rtomayko committed Apr 25, 2009
Showing with 8 additions and 2 deletions.
  1. +2 −0 test/helper.rb
  2. +6 −2 test/routing_test.rb
View
@@ -1,3 +1,5 @@
+ENV['RACK_ENV'] = 'test'
+
begin
require 'rack'
rescue LoadError
View
@@ -44,15 +44,19 @@ class RoutingTest < Test::Unit::TestCase
assert_equal 404, status
end
- it "sets the content-type to text/html in the default 404 handler" do
+ it "overrides the content-type in error handlers" do
mock_app {
before { content_type 'text/plain' }
+ error Sinatra::NotFound do
+ content_type "text/html"
+ "<h1>Not Found</h1>"
+ end
}
get '/foo'
assert_equal 404, status
assert_equal 'text/html', response["Content-Type"]
- assert body.include?("Sinatra doesn't know this ditty")
+ assert_equal "<h1>Not Found</h1>", response.body
end
it 'takes multiple definitions of a route' do

0 comments on commit f3ce689

Please sign in to comment.