Test for thumbnail only if ImageMagick is present.

ari · Jul 27, 2015 · 005932b · 005932b
1 parent 87e2153
commit 005932b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -60,6 +60,10 @@ def project_with_some_tasks(user, options = {})
 
     return project
   end
+
+  def imagemagick_present?
+    `which convert`.present?
+  end
 end
 
 module ActionController

diff --git a/test/unit/project_file_test.rb b/test/unit/project_file_test.rb
@@ -29,14 +29,18 @@ class ProjectFileTest < ActiveRecord::TestCase
     should "be able to png files" do
       photo = ProjectFile.make :file => Rails.root.join("app/assets/images/rails.png").open
       assert photo.image?
-      assert photo.thumbnail?
+      if imagemagick_present?
+        assert photo.thumbnail?
+      end
       assert File.exists?(photo.file_path)
     end
 
     should "be able to gif files" do
       photo = ProjectFile.make :file => Rails.root.join("app/assets/images/ajax-bar-loader.gif").open
       assert photo.image?
-      assert photo.thumbnail?
+      if imagemagick_present?
+        assert photo.thumbnail?
+      end
       assert File.exists?(photo.file_path)
     end
   end