jro_apps/redmine Commit - r13652:0b04de0a23e2

Send a better content type than application/octet-stream (#19131)....

Jean-Philippe Lang -

r13652:0b04de0a23e2

parent child

Context file:

r13652:0b04de0a23e2

app/controllers/attachments_controller.rb +1 -1

               def detect_content_type(attachment)
                 content_type = attachment.content_type
-                if content_type.blank?
+                if content_type.blank? || content_type == "application/octet-stream"
                   content_type = Redmine::MimeType.of(attachment.filename)
                 end
                 content_type.to_s

test/fixtures/attachments.yml +2 -2

               filesize: 157
               filename: archive.zip
               author_id: 2
-              content_type: application/octet-stream
+              content_type: application/zip
             attachments_007:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Issue
               filesize: 157
               filename: archive.zip
               author_id: 1
-              content_type: application/octet-stream
+              content_type: application/zip
             attachments_008:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Project

test/functional/attachments_controller_test.rb +10 -1

               def test_show_other
                 get :show, :id => 6
                 assert_response :success
-                assert_equal 'application/octet-stream', @response.content_type
+                assert_equal 'application/zip', @response.content_type
                 set_tmp_attachments_directory
               end
                 set_tmp_attachments_directory
               end
+              def test_download_should_assign_better_content_type_than_application_octet_stream
+                Attachment.find(4).update! :content_type => "application/octet-stream"
+                get :download, :id => 4
+                assert_response :success
+                assert_equal 'text/x-ruby', @response.content_type
+                set_tmp_attachments_directory
+              end
               def test_download_missing_file
                 get :download, :id => 2
                 assert_response 404

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

               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/octet-stream', @response.content_type
+                assert_equal 'application/zip', @response.content_type
                 set_tmp_attachments_directory
               end

General Comments 0

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

No TODOs yet

	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