cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return an updated copy of the note from the delete call

Browse source
This commit is contained in:
Tom Hughes 2013-04-08 21:48:06 +01:00
parent 030bb31ec1
commit 4b669ec1ae
2 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/controllers/notes_controller.rb
View file

@ -198,20 +198,23 @@ class NotesController < ApplicationController
comment = params[:text]
# Find the note and check it is valid
note = Note.find(id)
raise OSM::APINotFoundError unless note
raise OSM::APIAlreadyDeletedError.new("note", note.id) unless note.visible?
@note = Note.find(id)
raise OSM::APINotFoundError unless @note
raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
# Mark the note as hidden
Note.transaction do
note.status = "hidden"
note.save
@note.status = "hidden"
@note.save
add_comment(note, comment, "hidden")
add_comment(@note, comment, "hidden")
end
# Render the result
render :text => "ok\n", :content_type => "text/html"
# Return a copy of the updated note
respond_to do |format|
format.xml { render :action => :show }
format.json { render :action => :show }
end
end
##

23
test/functional/notes_controller_test.rb
View file

@ -343,38 +343,47 @@ class NotesControllerTest < ActionController::TestCase
end
def test_note_delete_success
delete :destroy, {:id => notes(:open_note_with_comment).id}
delete :destroy, {:id => notes(:open_note_with_comment).id, :text => "This is a hide comment", :format => "json"}
assert_response :unauthorized
basic_authorization(users(:public_user).email, "test")
delete :destroy, {:id => notes(:open_note_with_comment).id}
delete :destroy, {:id => notes(:open_note_with_comment).id, :text => "This is a hide comment", :format => "json"}
assert_response :forbidden
basic_authorization(users(:moderator_user).email, "test")
delete :destroy, {:id => notes(:open_note_with_comment).id}
delete :destroy, {:id => notes(:open_note_with_comment).id, :text => "This is a hide comment", :format => "json"}
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "Feature", js["type"]
assert_equal notes(:open_note_with_comment).id, js["properties"]["id"]
assert_equal "hidden", js["properties"]["status"]
assert_equal 3, js["properties"]["comments"].count
assert_equal "hidden", js["properties"]["comments"].last["action"]
assert_equal "This is a hide comment", js["properties"]["comments"].last["text"]
assert_equal "moderator", js["properties"]["comments"].last["user"]
get :show, {:id => notes(:open_note_with_comment).id, :format => 'json'}
assert_response :gone
end
def test_note_delete_fail
delete :destroy, {:id => 12345}
delete :destroy, {:id => 12345, :format => "json"}
assert_response :unauthorized
basic_authorization(users(:public_user).email, "test")
delete :destroy, {:id => 12345}
delete :destroy, {:id => 12345, :format => "json"}
assert_response :forbidden
basic_authorization(users(:moderator_user).email, "test")
delete :destroy, {:id => 12345}
delete :destroy, {:id => 12345, :format => "json"}
assert_response :not_found
delete :destroy, {:id => notes(:hidden_note_with_comment).id}
delete :destroy, {:id => notes(:hidden_note_with_comment).id, :format => "json"}
assert_response :gone
end