summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-10-22 14:12:09 +0000
committerGo MAEDA <maeda@farend.jp>2019-10-22 14:12:09 +0000
commit2e6b3b92482b41f626caca641aff9a1707bfffe9 (patch)
tree6ea672a909435f98a4b405973919de2b2dcaf844 /test
parenta8b6e805a793a0a792e7ed16747832dff2d2d3f3 (diff)
downloadredmine-2e6b3b92482b41f626caca641aff9a1707bfffe9.tar.gz
redmine-2e6b3b92482b41f626caca641aff9a1707bfffe9.zip
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
Diffstat (limited to 'test')
-rw-r--r--test/functional/attachments_controller_test.rb2
1 files changed, 2 insertions, 0 deletions
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 => {