static_test.rb in adamwiggins-sinatra-0.10.1

- old
+ new
@@ -1,60 +1,87 @@
-require 'test/spec'
-require 'sinatra/base'
-require 'sinatra/test'
+require File.dirname(__FILE__) + '/helper'
 
-describe 'Static' do
-  include Sinatra::Test
-  F = ::File
-
-  before do
-    @app = mock_app {
+class StaticTest < Test::Unit::TestCase
+  setup do
+    mock_app {
       set :static, true
-      set :public, F.dirname(__FILE__)
+      set :public, File.dirname(__FILE__)
     }
   end
 
   it 'serves GET requests for files in the public directory' do
-    get "/#{F.basename(__FILE__)}"
-    should.be.ok
-    body.should.equal File.read(__FILE__)
-    response['Content-Length'].should.equal File.size(__FILE__).to_s
-    response.headers.should.include 'Last-Modified'
+    get "/#{File.basename(__FILE__)}"
+    assert ok?
+    assert_equal File.read(__FILE__), body
+    assert_equal File.size(__FILE__).to_s, response['Content-Length']
+    assert response.headers.include?('Last-Modified')
   end
 
+  it 'produces a body that can be iterated over multiple times' do
+    env = Rack::MockRequest.env_for("/#{File.basename(__FILE__)}")
+    status, headers, body = @app.call(env)
+    buf1, buf2 = [], []
+    body.each { |part| buf1 << part }
+    body.each { |part| buf2 << part }
+    assert_equal buf1.join, buf2.join
+    assert_equal File.read(__FILE__), buf1.join
+  end
+
   it 'serves HEAD requests for files in the public directory' do
-    head "/#{F.basename(__FILE__)}"
-    should.be.ok
-    body.should.be.empty
-    response['Content-Length'].should.equal File.size(__FILE__).to_s
-    response.headers.should.include 'Last-Modified'
+    head "/#{File.basename(__FILE__)}"
+    assert ok?
+    assert_equal '', body
+    assert_equal File.size(__FILE__).to_s, response['Content-Length']
+    assert response.headers.include?('Last-Modified')
   end
 
+  %w[POST PUT DELETE].each do |verb|
+    it "does not serve #{verb} requests" do
+      send verb.downcase, "/#{File.basename(__FILE__)}"
+      assert_equal 404, status
+    end
+  end
+
   it 'serves files in preference to custom routes' do
-    @app.get("/#{F.basename(__FILE__)}") { 'Hello World' }
-    get "/#{F.basename(__FILE__)}"
-    should.be.ok
-    body.should.not.equal 'Hello World'
+    @app.get("/#{File.basename(__FILE__)}") { 'Hello World' }
+    get "/#{File.basename(__FILE__)}"
+    assert ok?
+    assert body != 'Hello World'
   end
 
   it 'does not serve directories' do
     get "/"
-    should.be.not_found
+    assert not_found?
   end
 
   it 'passes to the next handler when the static option is disabled' do
     @app.set :static, false
-    get "/#{F.basename(__FILE__)}"
-    should.be.not_found
+    get "/#{File.basename(__FILE__)}"
+    assert not_found?
   end
 
   it 'passes to the next handler when the public option is nil' do
     @app.set :public, nil
-    get "/#{F.basename(__FILE__)}"
-    should.be.not_found
+    get "/#{File.basename(__FILE__)}"
+    assert not_found?
   end
 
   it '404s when a file is not found' do
     get "/foobarbaz.txt"
-    should.be.not_found
+    assert not_found?
+  end
+
+  it 'serves files when .. path traverses within public directory' do
+    get "/data/../#{File.basename(__FILE__)}"
+    assert ok?
+    assert_equal File.read(__FILE__), body
+  end
+
+  it '404s when .. path traverses outside of public directory' do
+    mock_app {
+      set :static, true
+      set :public, File.dirname(__FILE__) + '/data'
+    }
+    get "/../#{File.basename(__FILE__)}"
+    assert not_found?
   end
 end