Download all attachments in a journal (#35462).

Patch by Takenori TAKAKI.


git-svn-id: http://svn.redmine.org/redmine/trunk@21292 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 30 insertions, 0 deletions

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 108b0dfae..6e79dce2e 100644
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -184,6 +184,22 @@ class ApplicationHelperTest < Redmine::HelperTest
     to_test.each {|text, result| assert_equal "<p>#{result}</p>", textilizable(text, :attachments => attachments)}
   end
 
+  def test_attached_images_on_issue
+    issue = Issue.generate!
+    attachment_1 = Attachment.generate!(:file => mock_file_with_options(:original_filename => "attached_on_issue.png"), :container => issue)
+    journal = issue.init_journal(User.find(2), issue)
+    attachment_2 = Attachment.generate!(:file => mock_file_with_options(:original_filename => "attached_on_journal.png"), :container => issue)
+    journal.journalize_attachment(attachment_2, :added)
+
+    raw = <<~RAW
+      !attached_on_issue.png!
+      !attached_on_journal.png!'
+    RAW
+
+    assert textilizable(raw, :object => journal).include?("<img src=\"/attachments/download/#{attachment_1.id}/attached_on_issue.png\" alt=\"\" />")
+    assert textilizable(raw, :object => journal).include?("<img src=\"/attachments/download/#{attachment_2.id}/attached_on_journal.png\" alt=\"\" />")
+  end
+
   def test_attached_images_with_textile_and_non_ascii_filename
     to_test = {
       'CAFÉ.JPG' => 'CAF%C3%89.JPG',
diff --git a/test/unit/journal_test.rb b/test/unit/journal_test.rb
index 096240734..345d64aba 100644
--- a/test/unit/journal_test.rb
+++ b/test/unit/journal_test.rb
@@ -222,4 +222,18 @@ class JournalTest < ActiveSupport::TestCase
     visible_details = journal.visible_details(User.find(2))
     assert_equal 2, visible_details.size
   end
+
+  def test_attachments
+    journal = Journal.new
+    [0, 1].map{ |i| Attachment.generate!(:file => mock_file_with_options(:original_filename => "image#{i}.png")) }.each do |attachment|
+      journal.details << JournalDetail.new(:property => 'attachment', :prop_key => attachment.id, :value => attachment.filename)
+    end
+
+    attachments = journal.attachments
+    assert_equal 2, attachments.size
+    attachments.each_with_index do |attachment, i|
+      assert_kind_of Attachment, attachment
+      assert_equal "image#{i}.png", attachment.filename
+    end
+  end
 end