From: Go MAEDA <maeda@farend.jp>
Date: Tue, 22 Oct 2019 14:12:09 +0000 (+0000)
Subject: Skip AttachmentsControllerTest#test_thumbnail_for_pdf_should_be_png when ImageMagick... 
X-Git-Tag: 4.1.0~277
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2e6b3b92482b41f626caca641aff9a1707bfffe9;p=redmine.git

Skip AttachmentsControllerTest#test_thumbnail_for_pdf_should_be_png when ImageMagick convert is not available (#32307, #22481).

Patch by Go MAEDA.


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

diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index b9fad5ec2..831c6e5fb 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -470,6 +470,8 @@ class AttachmentsControllerTest < Redmine::ControllerTest
 
   if gs_installed?
     def test_thumbnail_for_pdf_should_be_png
+      skip unless convert_installed?
+
       Attachment.clear_thumbnails
       @request.session[:user_id] = 2
       get :thumbnail, :params => {