jro_apps/redmine Commit - r7880:fa894328bb94

Merged r7983 and r7984 from trunk....

Jean-Philippe Lang -

r7880:fa894328bb94

parent child

Context file:

r7880:fa894328bb94

Collapse all files

app/models/version.rb +5 0

                  user.allowed_to?(:view_issues, self.project)
                end
+               # Version files have same visibility as project files
+               def attachments_visible?(*args)
+                 project.present? && project.attachments_visible?(*args)
+               end
                def start_date
                  @start_date ||= fixed_issues.minimum('start_date')
                end

test/fixtures/attachments.yml +1 -1

                container_type: Version
                container_id: 1
                downloads: 0
-               disk_filename: 060719210727_version_file.zip
+               disk_filename: 060719210727_archive.zip
                digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
                id: 9
                filesize: 452

test/functional/attachments_controller_test.rb +15 -2

                  assert_equal 'application/x-ruby', @response.content_type
                end
+               def test_download_version_file_with_issue_tracking_disabled
+                 Project.find(1).disable_module! :issue_tracking
+                 get :download, :id => 9
+                 assert_response :success
+               end
                def test_download_should_assign_content_type_if_blank
                  Attachment.find(4).update_attribute(:content_type, '')
                end
                def test_destroy_issue_attachment
+                 set_tmp_attachments_directory
                  issue = Issue.find(3)
                  @request.session[:user_id] = 2
                end
                def test_destroy_wiki_page_attachment
+                 set_tmp_attachments_directory
                  @request.session[:user_id] = 2
                  assert_difference 'Attachment.count', -1 do
                    post :destroy, :id => 3
                end
                def test_destroy_project_attachment
+                 set_tmp_attachments_directory
                  @request.session[:user_id] = 2
                  assert_difference 'Attachment.count', -1 do
                    post :destroy, :id => 8
                end
                def test_destroy_version_attachment
+                 set_tmp_attachments_directory
                  @request.session[:user_id] = 2
                  assert_difference 'Attachment.count', -1 do
                    post :destroy, :id => 9
                end
                def test_destroy_without_permission
-                 post :destroy, :id => 3
-                 assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2Fdestroy%2F3'
+                 set_tmp_attachments_directory
+                 assert_no_difference 'Attachment.count' do
+                   delete :destroy, :id => 3
+                 end
+                 assert_response 302
                  assert Attachment.find_by_id(3)
                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