jro_apps/redmine Commit - r15480:30fc03ac3259

Adds a routing test for deleting attachment via the API....

Jean-Philippe Lang -

r15480:30fc03ac3259

parent child

Context file:

r15480:30fc03ac3259

Collapse all files

test/integration/api_test/api_routing_test.rb +1 0

             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../test_helper', __FILE__)
             class Redmine::ApiTest::ApiRoutingTest < Redmine::ApiTest::Routing
               def test_attachments
                 should_route 'GET /attachments/1' => 'attachments#show', :id => '1'
                 should_route 'PATCH /attachments/1' => 'attachments#update', :id => '1'
+                should_route 'DELETE /attachments/1' => 'attachments#destroy', :id => '1'
                 should_route 'POST /uploads' => 'attachments#upload'
               end
               def test_custom_fields
                 should_route 'GET /custom_fields' => 'custom_fields#index'
               end
               def test_enumerations
                 should_route 'GET /enumerations/issue_priorities' => 'enumerations#index', :type => 'issue_priorities'
               end
               def test_groups
                 should_route 'GET /groups' => 'groups#index'
                 should_route 'POST /groups' => 'groups#create'
                 should_route 'GET /groups/1' => 'groups#show', :id => '1'
                 should_route 'PUT /groups/1' => 'groups#update', :id => '1'
                 should_route 'DELETE /groups/1' => 'groups#destroy', :id => '1'
               end
               def test_group_users
                 should_route 'POST /groups/567/users' => 'groups#add_users', :id => '567'
                 should_route 'DELETE /groups/567/users/12' => 'groups#remove_user', :id => '567', :user_id => '12'
               end
               def test_issue_categories
                 should_route 'GET /projects/foo/issue_categories' => 'issue_categories#index', :project_id => 'foo'
                 should_route 'POST /projects/foo/issue_categories' => 'issue_categories#create', :project_id => 'foo'
                 should_route 'GET /issue_categories/1' => 'issue_categories#show', :id => '1'
                 should_route 'PUT /issue_categories/1' => 'issue_categories#update', :id => '1'
                 should_route 'DELETE /issue_categories/1' => 'issue_categories#destroy', :id => '1'
               end
               def test_issue_relations
                 should_route 'GET /issues/1/relations' => 'issue_relations#index', :issue_id => '1'
                 should_route 'POST /issues/1/relations' => 'issue_relations#create', :issue_id => '1'
                 should_route 'GET /relations/23' => 'issue_relations#show', :id => '23'
                 should_route 'DELETE /relations/23' => 'issue_relations#destroy', :id => '23'
               end
               def test_issue_statuses
                 should_route 'GET /issue_statuses' => 'issue_statuses#index'
               end
               def test_issues
                 should_route 'GET /issues' => 'issues#index'
                 should_route 'POST /issues' => 'issues#create'
                 should_route 'GET /issues/64' => 'issues#show', :id => '64'
                 should_route 'PUT /issues/64' => 'issues#update', :id => '64'
                 should_route 'DELETE /issues/64' => 'issues#destroy', :id => '64'
               end
               def test_issue_watchers
                 should_route 'POST /issues/12/watchers' => 'watchers#create', :object_type => 'issue', :object_id => '12'
                 should_route 'DELETE /issues/12/watchers/3' => 'watchers#destroy', :object_type => 'issue', :object_id => '12', :user_id => '3'
               end
               def test_memberships
                 should_route 'GET /projects/5234/memberships' => 'members#index', :project_id => '5234'
                 should_route 'POST /projects/5234/memberships' => 'members#create', :project_id => '5234'
                 should_route 'GET /memberships/5234' => 'members#show', :id => '5234'
                 should_route 'PUT /memberships/5234' => 'members#update', :id => '5234'
                 should_route 'DELETE /memberships/5234' => 'members#destroy', :id => '5234'
               end
               def test_news
                 should_route 'GET /news' => 'news#index'
                 should_route 'GET /projects/567/news' => 'news#index', :project_id => '567'
               end
               def test_projects
                 should_route 'GET /projects' => 'projects#index'
                 should_route 'POST /projects' => 'projects#create'
                 should_route 'GET /projects/1' => 'projects#show', :id => '1'
                 should_route 'PUT /projects/1' => 'projects#update', :id => '1'
                 should_route 'DELETE /projects/1' => 'projects#destroy', :id => '1'
               end
               def test_queries
                 should_route 'GET /queries' => 'queries#index'
               end
               def test_roles
                 should_route 'GET /roles' => 'roles#index'
                 should_route 'GET /roles/2' => 'roles#show', :id => '2'
               end
               def test_time_entries
                 should_route 'GET /time_entries' => 'timelog#index'
                 should_route 'POST /time_entries' => 'timelog#create'
                 should_route 'GET /time_entries/1' => 'timelog#show', :id => '1'
                 should_route 'PUT /time_entries/1' => 'timelog#update', :id => '1'
                 should_route 'DELETE /time_entries/1' => 'timelog#destroy', :id => '1'
               end
               def test_trackers
                 should_route 'GET /trackers' => 'trackers#index'
               end
               def test_users
                 should_route 'GET /users' => 'users#index'
                 should_route 'POST /users' => 'users#create'
                 should_route 'GET /users/44' => 'users#show', :id => '44'
                 should_route 'GET /users/current' => 'users#show', :id => 'current'
                 should_route 'PUT /users/44' => 'users#update', :id => '44'
                 should_route 'DELETE /users/44' => 'users#destroy', :id => '44'
               end
               def test_versions
                 should_route 'GET /projects/foo/versions' => 'versions#index', :project_id => 'foo'
                 should_route 'POST /projects/foo/versions' => 'versions#create', :project_id => 'foo'
                 should_route 'GET /versions/1' => 'versions#show', :id => '1'
                 should_route 'PUT /versions/1' => 'versions#update', :id => '1'
                 should_route 'DELETE /versions/1' => 'versions#destroy', :id => '1'
               end
               def test_wiki
                 should_route 'GET /projects/567/wiki/index' => 'wiki#index', :project_id => '567'
                 should_route 'GET /projects/567/wiki/my_page' => 'wiki#show', :project_id => '567', :id => 'my_page'
                 should_route 'GET /projects/567/wiki/my_page' => 'wiki#show', :project_id => '567', :id => 'my_page'
                 should_route 'GET /projects/1/wiki/my_page/2' => 'wiki#show', :project_id => '1', :id => 'my_page', :version => '2'
                 should_route 'PUT /projects/567/wiki/my_page' => 'wiki#update', :project_id => '567', :id => 'my_page'
                 should_route 'DELETE /projects/567/wiki/my_page' => 'wiki#destroy', :project_id => '567', :id => 'my_page'
               end
             end

test/integration/api_test/attachments_test.rb +2 -2

             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../test_helper', __FILE__)
             class Redmine::ApiTest::AttachmentsTest < Redmine::ApiTest::Base
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules,
                        :attachments
               def setup
                 super
                 set_fixtures_attachments_directory
               end
               def teardown
                 super
                 set_tmp_attachments_directory
               end
               test "GET /attachments/:id.xml should return the attachment" do
                 get '/attachments/7.xml', {}, credentials('jsmith')
                 assert_response :success
                 assert_equal 'application/xml', @response.content_type
                 assert_select 'attachment id', :text => '7' do
                   assert_select '~ filename', :text => 'archive.zip'
                   assert_select '~ content_url', :text => 'http://www.example.com/attachments/download/7/archive.zip'
                 end
               end
               test "GET /attachments/:id.xml for image should include thumbnail_url" do
                 get '/attachments/16.xml', {}, credentials('jsmith')
                 assert_response :success
                 assert_equal 'application/xml', @response.content_type
                 assert_select 'attachment id:contains(16)' do
                   assert_select '~ thumbnail_url', :text => 'http://www.example.com/attachments/thumbnail/16'
                 end
               end
               test "GET /attachments/:id.xml should deny access without credentials" do
                 get '/attachments/7.xml'
                 assert_response 401
                 set_tmp_attachments_directory
               end
               test "GET /attachments/download/:id/:filename should return the attachment content" do
                 get '/attachments/download/7/archive.zip', {}, credentials('jsmith')
                 assert_response :success
                 assert_equal 'application/zip', @response.content_type
                 set_tmp_attachments_directory
               end
               test "GET /attachments/download/:id/:filename should deny access without credentials" do
                 get '/attachments/download/7/archive.zip'
                 assert_response 302
                 set_tmp_attachments_directory
               end
               test "GET /attachments/thumbnail/:id should return the thumbnail" do
                 skip unless convert_installed?
                 get '/attachments/thumbnail/16', {}, credentials('jsmith')
                 assert_response :success
               end
-              test "Destroy /attachments/:id.xml should return ok and deleted Attachment" do
+              test "DELETE /attachments/:id.xml should return ok and delete 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
+              test "DELETE /attachments/:id.json should return ok and delete 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 "PATCH /attachments/:id.json should update the attachment" do
                 patch '/attachments/7.json',
                   {:attachment => {:filename => 'renamed.zip', :description => 'updated'}},
                   credentials('jsmith')
                 assert_response :ok
                 assert_equal 'application/json', response.content_type
                 attachment = Attachment.find(7)
                 assert_equal 'renamed.zip', attachment.filename
                 assert_equal 'updated', attachment.description
               end
               test "PATCH /attachments/:id.json with failure should return the errors" do
                 patch '/attachments/7.json',
                   {:attachment => {:filename => '', :description => 'updated'}},
                   credentials('jsmith')
                 assert_response 422
                 assert_equal 'application/json', response.content_type
                 json = ActiveSupport::JSON.decode(response.body)
                 assert_include "File cannot be blank", json['errors']
               end
               test "POST /uploads.xml should return the token" do
                 set_tmp_attachments_directory
                 assert_difference 'Attachment.count' do
                   post '/uploads.xml', 'File content', {"CONTENT_TYPE" => 'application/octet-stream'}.merge(credentials('jsmith'))
                   assert_response :created
                   assert_equal 'application/xml', response.content_type
                 end
                 xml = Hash.from_xml(response.body)
                 assert_kind_of Hash, xml['upload']
                 token = xml['upload']['token']
                 assert_not_nil token
                 attachment_id = xml['upload']['id']
                 assert_not_nil attachment_id
                 attachment = Attachment.order('id DESC').first
                 assert_equal token, attachment.token
                 assert_equal attachment_id, attachment.id.to_s
                 assert_nil attachment.container
                 assert_equal 2, attachment.author_id
                 assert_equal 'File content'.size, attachment.filesize
                 assert attachment.content_type.blank?
                 assert attachment.filename.present?
                 assert_match /\d+_[0-9a-z]+/, attachment.diskfile
                 assert File.exist?(attachment.diskfile)
                 assert_equal 'File content', File.read(attachment.diskfile)
               end
               test "POST /uploads.json should return the token" do
                 set_tmp_attachments_directory
                 assert_difference 'Attachment.count' do
                   post '/uploads.json', 'File content', {"CONTENT_TYPE" => 'application/octet-stream'}.merge(credentials('jsmith'))
                   assert_response :created
                   assert_equal 'application/json', response.content_type
                 end
                 json = ActiveSupport::JSON.decode(response.body)
                 assert_kind_of Hash, json['upload']
                 token = json['upload']['token']
                 assert_not_nil token
                 attachment = Attachment.order('id DESC').first
                 assert_equal token, attachment.token
               end
               test "POST /uploads.xml should accept :filename param as the attachment filename" do
                 set_tmp_attachments_directory
                 assert_difference 'Attachment.count' do
                   post '/uploads.xml?filename=test.txt', 'File content', {"CONTENT_TYPE" => 'application/octet-stream'}.merge(credentials('jsmith'))
                   assert_response :created
                 end
                 attachment = Attachment.order('id DESC').first
                 assert_equal 'test.txt', attachment.filename
                 assert_match /_test\.txt$/, attachment.diskfile
               end
               test "POST /uploads.xml should not accept other content types" do
                 set_tmp_attachments_directory
                 assert_no_difference 'Attachment.count' do
                   post '/uploads.xml', 'PNG DATA', {"CONTENT_TYPE" => 'image/png'}.merge(credentials('jsmith'))
                   assert_response 406
                 end
               end
               test "POST /uploads.xml should return errors if file is too big" do
                 set_tmp_attachments_directory
                 with_settings :attachment_max_size => 1 do
                   assert_no_difference 'Attachment.count' do
                     post '/uploads.xml', ('x' * 2048), {"CONTENT_TYPE" => 'application/octet-stream'}.merge(credentials('jsmith'))
                     assert_response 422
                     assert_select 'error', :text => /exceeds the maximum allowed file size/
                   end
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages