test/test_application_convert.rb in kanoko-0.1.0 vs test/test_application_convert.rb in kanoko-0.1.1

@@ -1,11 +1,6 @@
-require 'digest/sha1'
-require 'stringio'
-require 'minitest/autorun'
-require "rack/test"
-require "exifr"
-require "kanoko/application/convert"
+require 'helper'
 
 class TestKanokoApplicationConvert < Minitest::Test
   include Rack::Test::Methods
 
   class TestApp < Kanoko::Application::Convert
@@ -21,11 +16,10 @@
   def app
     TestApp.new
   end
 
   def setup
-    ENV['RACK_ENV'] = 'test'
     Kanoko.configure.digest_func = "sha1"
     Kanoko.configure.secret_key = "test"
   end
 
   def assert_jpeg(expected, actual)
@@ -33,31 +27,73 @@
     actual_exif = EXIFR::JPEG.new(StringIO.new(actual))
     assert_equal expected_exif.to_hash, actual_exif.to_hash
   end
 
   def test_resize
-    url = Kanoko.path_for(:resize, "10x10", "src.jpg")
-    get url, {}, {"REQUEST_URI" => url}
+    path = Kanoko.path_for(:resize, "10x10", "src.jpg")
+    get path
     assert last_response.ok?
     assert 0 < last_response.body.length
     assert_jpeg File.read("test/resize.jpg"), last_response.body
   end
 
   def test_resize_and_crop
-    url = Kanoko.path_for(:resize, "10x10", :crop, "5x5+1+1", "src.jpg")
-    get url, {}, {"REQUEST_URI" => url}
+    path = Kanoko.path_for(:resize, "10x10", :crop, "5x5+1+1", "src.jpg")
+    get path
     assert last_response.ok?
     assert 0 < last_response.body.length
     assert_jpeg File.read("test/resize_and_crop.jpg"), last_response.body
   end
 
-  def test_not_found
-    get "/nothing"
-    assert_equal 404, last_response.status
+  def test_auto_orient
+    path = Kanoko.path_for(:auto_orient, "src.jpg")
+    get path
+    assert last_response.ok?
+    assert 0 < last_response.body.length
+    assert_jpeg File.read("test/src.jpg"), last_response.body
+  end
 
-    post "/nothing"
-    assert_equal 404, last_response.status
+  def test_resize_and_auto_orient
+    path = Kanoko.path_for(:resize, "10x10", :auto_orient, "src.jpg")
+    get path
+    assert last_response.ok?
+    assert 0 < last_response.body.length
+    assert_jpeg File.read("test/resize.jpg"), last_response.body
+  end
 
-    delete "/nothing"
+  def test_undefined_func
+    path = Kanoko.path_for(:undefined, "10x10", "src.jpg")
+    get path
+    assert_equal 400, last_response.status
+    assert_equal "", last_response.body
+  end
+
+  def test_root_not_found
+    path = "/"
+    get path
     assert_equal 404, last_response.status
+    assert_equal "", last_response.body
+  end
+
+  def test_invalid_path
+    path = "/invalid/path/to/src"
+    get path
+    assert_equal 400, last_response.status
+    assert_equal "", last_response.body
+  end
+
+  class Kanoko::Application::Convert::Function
+    def method_for_500
+      ['-undefined-imagemagick-option']
+    end
+  end
+
+  def test_500
+    path = Kanoko.path_for(:method_for_500, "src.jpg")
+    out, err = capture_subprocess_io do
+      get path
+    end
+    assert_equal 500, last_response.status
+    assert_equal "", last_response.body
+    assert_match /convert: unrecognized option `-undefined-imagemagick-option'/, err
   end
 end