diff --git app/controllers/attachments_controller.rb app/controllers/attachments_controller.rb index d81b3d9..8c6b448 100644 --- app/controllers/attachments_controller.rb +++ app/controllers/attachments_controller.rb @@ -22,7 +22,7 @@ class AttachmentsController < ApplicationController before_filter :delete_authorize, :only => :destroy before_filter :authorize_global, :only => :upload - accept_api_auth :show, :download, :thumbnail, :upload + accept_api_auth :show, :download, :thumbnail, :upload, :destroy def show respond_to do |format| @@ -130,6 +130,7 @@ class AttachmentsController < ApplicationController respond_to do |format| format.html { redirect_to_referer_or project_path(@project) } format.js + format.api { render_api_ok } end end diff --git test/integration/api_test/attachments_test.rb test/integration/api_test/attachments_test.rb index 4ec4c84..640a782 100644 --- test/integration/api_test/attachments_test.rb +++ test/integration/api_test/attachments_test.rb @@ -81,6 +81,24 @@ class Redmine::ApiTest::AttachmentsTest < Redmine::ApiTest::Base assert_response :success end + test "Destroy /attachments/:id.xml should return ok and deleted Attachment" do + assert_difference 'Attachment.count', -1 do + delete '/attachments/7.xml', {}, credentials('jsmith') + assert_response :ok + assert_equal '', response.body + end + assert_nil Attachment.find_by_id(7) + end + + test "Destroy /attachments/:id.json should return ok and deleted Attachment" do + assert_difference 'Attachment.count', -1 do + delete '/attachments/7.json', {}, credentials('jsmith') + assert_response :ok + assert_equal '', response.body + end + assert_nil Attachment.find_by_id(7) + end + test "POST /uploads.xml should return the token" do set_tmp_attachments_directory assert_difference 'Attachment.count' do