Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions lib/lotus/action/head.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@ module Head
'Allow' => true,
'Content-Encoding' => true,
'Content-Language' => true,
'Content-Length' => true,
'Content-Location' => true,
'Content-MD5' => true,
'Content-Range' => true,
'Content-Type' => true,
'Expires' => true,
'Last-Modified' => true,
'extension-header' => true
Expand Down
21 changes: 9 additions & 12 deletions test/integration/head_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,18 @@ def response
response.headers['Content-Language'].must_equal 'en'
end

# FIXME Review this
unless [204, 205, 304].include?(code)
it "sends Content-Length header" do
get "/code/#{ code }"
it "doesn't send Content-Length header" do
get "/code/#{ code }"

response.status.must_equal(code)
response.headers['Content-Length'].must_equal 4
end
response.status.must_equal(code)
response.headers.key?('Content-Length').must_equal false
end

it "sends Content-Type header" do
get "/code/#{ code }"
it "doesn't send Content-Type header" do
get "/code/#{ code }"

response.status.must_equal(code)
response.headers['Content-Type'].must_equal 'application/octet-stream; charset=utf-8'
end
response.status.must_equal(code)
response.headers.key?('Content-Type').must_equal false
end

it "sends Content-Location header" do
Expand Down