More fine-grained tests for thumbnail.

test/thumbnail_test.rb

@@ -113,10 +113,9 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip.expects(:run).with do |*arg|
-          arg[0] == 'convert' &&
-          arg[1] == ':source -resize "x50" -crop "100x50+114+0" +repage :dest' &&
-          arg[2][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
+        @thumb.expects(:convert).with do |*arg|
+          arg[0] == ':source -resize "x50" -crop "100x50+114+0" +repage :dest' &&
+          arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end
@@ -139,10 +138,9 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip.expects(:run).with do |*arg|
-          arg[0] == 'convert' &&
-          arg[1] == '-strip :source -resize "x50" -crop "100x50+114+0" +repage :dest' &&
-          arg[2][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
+        @thumb.expects(:convert).with do |*arg|
+          arg[0] == '-strip :source -resize "x50" -crop "100x50+114+0" +repage :dest' &&
+          arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end
@@ -181,10 +179,9 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip.expects(:run).with do |*arg|
-          arg[0] == 'convert' &&
-          arg[1] == ':source -resize "x50" -crop "100x50+114+0" +repage -strip -depth 8 :dest' &&
-          arg[2][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
+        @thumb.expects(:convert).with do |*arg|
+          arg[0] == ':source -resize "x50" -crop "100x50+114+0" +repage -strip -depth 8 :dest' &&
+          arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end