From 93e2f068487f3ca9dba4ec6a0e919fd20c9402f2 Mon Sep 17 00:00:00 2001
From: Blake Mizerany <blakemizerany@blake-mizeranys-computer.local>
Date: Wed, 21 Nov 2007 15:45:38 -0800
Subject: [PATCH] * test test * test 404 status returned when 404

---
 lib/sinatra.rb           |  3 +++
 test/dispatching_test.rb |  1 +
 test/test_test.rb        | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 test/test_test.rb

diff --git a/lib/sinatra.rb b/lib/sinatra.rb
index 13d0b49..bf85e40 100644
--- a/lib/sinatra.rb
+++ b/lib/sinatra.rb
@@ -72,6 +72,7 @@ module Sinatra
     end
 
     error 404 do
+      status 404
       "<h1>Not Found</h1>"
     end
   end
@@ -165,3 +166,5 @@ def error(num, &b)
   raise 'You must specify a block to assciate with an error' if b.nil?
   Sinatra.define_error_route(num, &b)
 end
+
+Sinatra.setup_default_events!
diff --git a/test/dispatching_test.rb b/test/dispatching_test.rb
index aad1591..94dc7ed 100644
--- a/test/dispatching_test.rb
+++ b/test/dispatching_test.rb
@@ -33,6 +33,7 @@ context "Dispatching" do
   
   specify "should return standard 404" do
     get_it '/'
+    status.should.equal 404
     body.should.equal '<h1>Not Found</h1>'
   end
   
diff --git a/test/test_test.rb b/test/test_test.rb
new file mode 100644
index 0000000..493125f
--- /dev/null
+++ b/test/test_test.rb
@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../lib/sinatra'
+require File.dirname(__FILE__) + '/../lib/sinatra/test'
+
+class TestTest < Test::Unit::TestCase
+  
+  def test_test
+    get_it '/'
+    assert_equal 404, status
+    assert_equal '<h1>Not Found</h1>', body
+  end
+  
+  def test_no_spec
+    assert !defined?(Test::Spec)
+    assert !self.class.method_defined?(:should)
+  end
+  
+end
+
-- 
2.11.4.GIT