5apps/liquor-cabinet
5apps/liquor-cabinet
4
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Activity

Send "Conflict" message body with 409 responses (closes #409)

Browse Source
This commit is contained in:
Garret Alfert 2016-06-02 13:09:05 +02:00
parent 9a9a9c79e5
commit 83d8f29a04
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/remote_storage/swift.rb
View File

@ -133,7 +133,7 @@ module RemoteStorage
def put_data(user, directory, key, data, content_type) def put_data(user, directory, key, data, content_type)
server.halt 400 if server.env["HTTP_CONTENT_RANGE"] server.halt 400 if server.env["HTTP_CONTENT_RANGE"]
server.halt 409 if has_name_collision?(user, directory, key) server.halt 409, "Conflict" if has_name_collision?(user, directory, key)
existing_metadata = redis.hgetall redis_metadata_object_key(user, directory, key) existing_metadata = redis.hgetall redis_metadata_object_key(user, directory, key)
url = url_for_key(user, directory, key) url = url_for_key(user, directory, key)

1
spec/swift/app_spec.rb
View File

@ -134,6 +134,7 @@ describe "App" do
end end
last_response.status.must_equal 409 last_response.status.must_equal 409
last_response.body.must_equal "Conflict"
metadata = redis.hgetall "rs:m:phil:food" metadata = redis.hgetall "rs:m:phil:food"
metadata.must_be_empty metadata.must_be_empty