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

Change response code for successful DELETE requests from 204 to 200

Browse Source
This commit is contained in:
Garret Alfert 2013-12-08 22:45:03 +01:00
parent 96438bac8d
commit a559f55a6d
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/remote_storage/riak.rb
View File

@ -144,7 +144,7 @@ module RemoteStorage
timestamp = (Time.now.to_f * 1000).to_i
delete_or_update_directory_objects(user, directory, timestamp)
server.halt riak_response[:code]
server.halt 200
rescue ::Riak::HTTPFailedRequest
server.halt 404
end

2
spec/directories_spec.rb
View File

@ -486,7 +486,7 @@ describe "Directories" do
it "deletes the directory objects for all empty parent directories" do
delete "/jimmy/tasks/home/trash"
last_response.status.must_equal 204
last_response.status.must_equal 200
lambda {
directory_bucket.get("jimmy:tasks/home")

12
spec/permissions_spec.rb
View File

@ -186,7 +186,7 @@ describe "Permissions" do
it "removes the key from a top-level directory" do
delete "/jimmy/tasks/1"
last_response.status.must_equal 204
last_response.status.must_equal 200
lambda {
data_bucket.get("jimmy:tasks:1")
}.must_raise Riak::HTTPFailedRequest
@ -195,7 +195,7 @@ describe "Permissions" do
it "removes the key from a top-level directory" do
delete "/jimmy/tasks/home/1"
last_response.status.must_equal 204
last_response.status.must_equal 200
lambda {
data_bucket.get("jimmy:tasks/home:1")
}.must_raise Riak::HTTPFailedRequest
@ -212,7 +212,7 @@ describe "Permissions" do
it "removes the key" do
delete "/jimmy/public/tasks/open"
last_response.status.must_equal 204
last_response.status.must_equal 200
lambda {
data_bucket.get("jimmy:public/tasks:open")
}.must_raise Riak::HTTPFailedRequest
@ -296,7 +296,7 @@ describe "Permissions" do
it "allows DELETE requests" do
delete "/jimmy/documents/very/interesting/text"
last_response.status.must_equal 204
last_response.status.must_equal 200
lambda {
data_bucket.get("jimmy:documents/very/interesting:text")
}.must_raise Riak::HTTPFailedRequest
@ -327,7 +327,7 @@ describe "Permissions" do
it "allows DELETE requests" do
delete "/jimmy/root"
last_response.status.must_equal 204
last_response.status.must_equal 200
lambda {
data_bucket.get("jimmy::root")
}.must_raise Riak::HTTPFailedRequest
@ -358,7 +358,7 @@ describe "Permissions" do
it "allows DELETE requests" do
delete "/jimmy/public/tasks/hello"
last_response.status.must_equal 204
last_response.status.must_equal 200
lambda {
data_bucket.get("jimmy:public/tasks:hello")
}.must_raise Riak::HTTPFailedRequest

8
spec/riak_spec.rb
View File

@ -524,7 +524,7 @@ describe "App with Riak backend" do
end
it "removes the key" do
last_response.status.must_equal 204
last_response.status.must_equal 200
lambda {
data_bucket.get("jimmy:documents:foo")
}.must_raise Riak::HTTPFailedRequest
@ -564,7 +564,7 @@ describe "App with Riak backend" do
header "If-Match", old_etag
delete "/jimmy/documents/foo"
last_response.status.must_equal 204
last_response.status.must_equal 200
get "/jimmy/documents/foo"
last_response.status.must_equal 404
@ -593,14 +593,14 @@ describe "App with Riak backend" do
end
it "removes the main object" do
last_response.status.must_equal 204
last_response.status.must_equal 200
lambda {
data_bucket.get("jimmy:documents:jaypeg")
}.must_raise Riak::HTTPFailedRequest
end
it "removes the binary object" do
last_response.status.must_equal 204
last_response.status.must_equal 200
binary = cs_binary_bucket.files.get("jimmy:documents:jaypeg")
binary.must_be_nil