From: Tom Hughes <tom@compton.nu>
Date: Mon, 8 Apr 2013 20:48:06 +0000 (+0100)
Subject: Return an updated copy of the note from the delete call
X-Git-Tag: live~5052^2~3
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4b669ec1ae7470f68a9e00b6caffcc4a44240b7a?ds=sidebyside

Return an updated copy of the note from the delete call
---

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index e79be2e8d..36236ef10 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -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
 
   ##
diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb
index bfea29592..4bd0aa6cf 100644
--- a/test/functional/notes_controller_test.rb
+++ b/test/functional/notes_controller_test.rb
@@ -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