Requests for empty directories respond with 404 (refs #26)
This commit is contained in:
parent
2656239fb1
commit
f852e7719f
@ -75,8 +75,7 @@ module RemoteStorage
|
||||
|
||||
return listing.to_json
|
||||
rescue ::Riak::HTTPFailedRequest
|
||||
server.headers["Content-Type"] = "application/json"
|
||||
return "{}"
|
||||
server.halt 404
|
||||
end
|
||||
|
||||
def put_data(user, directory, key, data, content_type=nil)
|
||||
|
@ -187,8 +187,7 @@ describe "Directories" do
|
||||
it "returns an empty listing" do
|
||||
get "/jimmy/documents/notfound/"
|
||||
|
||||
last_response.status.must_equal 200
|
||||
last_response.body.must_equal "{}"
|
||||
last_response.status.must_equal 404
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -345,7 +345,7 @@ describe "Permissions" do
|
||||
it "allows GET requests" do
|
||||
get "/jimmy/public/tasks/"
|
||||
|
||||
last_response.status.must_equal 200
|
||||
last_response.status.must_equal 404
|
||||
end
|
||||
|
||||
it "allows PUT requests" do
|
||||
@ -403,19 +403,19 @@ describe "Permissions" do
|
||||
end
|
||||
|
||||
it "allows GET requests" do
|
||||
get "/jimmy/tasks/"
|
||||
get "/jimmy/public/tasks/"
|
||||
|
||||
last_response.status.must_equal 200
|
||||
last_response.status.must_equal 404
|
||||
end
|
||||
|
||||
it "disallows PUT requests" do
|
||||
put "/jimmy/tasks/foo", "some text"
|
||||
put "/jimmy/public/tasks/foo", "some text"
|
||||
|
||||
last_response.status.must_equal 403
|
||||
end
|
||||
|
||||
it "disallows DELETE requests" do
|
||||
delete "/jimmy/tasks/hello"
|
||||
delete "/jimmy/public/tasks/hello"
|
||||
|
||||
last_response.status.must_equal 403
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user