diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-16 17:37:24 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-16 17:37:24 +0000 |
| commit | fe95692f10c98ee6ff4a2fcdd405d8474fc9bf5e (patch) | |
| tree | c71b1e0da7aeaf1b5864d814deac67bd52f9df7a /test/test_helper.rb | |
| parent | 537be80be26c38d5384d588873d2682fd908ee62 (diff) | |
| download | redmine-fe95692f10c98ee6ff4a2fcdd405d8474fc9bf5e.tar.gz redmine-fe95692f10c98ee6ff4a2fcdd405d8474fc9bf5e.zip | |
Test if convert binary is available.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10014 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/test_helper.rb')
| -rw-r--r-- | test/test_helper.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test/test_helper.rb b/test/test_helper.rb index 6f5ab98a4..c4c956953 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -129,10 +129,7 @@ class ActiveSupport::TestCase end def self.convert_installed? - bin = Redmine::Configuration['imagemagick_convert_command'] || 'convert' - system("#{bin} -version") - rescue - false + Redmine::Thumbnail.convert_available? end # Returns the path to the test +vendor+ repository |