diff options
| author | Guilherme Mansur <guilherme.mansur@shopify.com> | 2019-04-23 16:11:10 -0400 |
|---|---|---|
| committer | Guilherme Mansur <guilherme.mansur@shopify.com> | 2019-04-24 07:59:12 -0400 |
| commit | 6133dad86970951094bdb4a603bc80c4968a9667 (patch) | |
| tree | c5823ae44fc4a88e39d52b1a9cfb672c27527aef /activestorage/test/analyzer/image_analyzer_test.rb | |
| parent | df35204ed190086ec95b308ac1764571344005a6 (diff) | |
| download | rails-6133dad86970951094bdb4a603bc80c4968a9667.tar.gz rails-6133dad86970951094bdb4a603bc80c4968a9667.tar.bz2 rails-6133dad86970951094bdb4a603bc80c4968a9667.zip | |
Don't fail ImageAnalyzer on unsupported types
Fix: #36065
The IamgeAnalyzer passes a image to ImageMagick without checking if the
image is supported by ImageMagick. This patch checks that image is
supported and if not logs an error and returns an empty hash instead of
raising an error. This is the same error handling we do when we
encounter a LoadError when mini_magick is not installed.
Diffstat (limited to 'activestorage/test/analyzer/image_analyzer_test.rb')
| -rw-r--r-- | activestorage/test/analyzer/image_analyzer_test.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/activestorage/test/analyzer/image_analyzer_test.rb b/activestorage/test/analyzer/image_analyzer_test.rb index 55bb5e7280..73438c15ab 100644 --- a/activestorage/test/analyzer/image_analyzer_test.rb +++ b/activestorage/test/analyzer/image_analyzer_test.rb @@ -29,4 +29,12 @@ class ActiveStorage::Analyzer::ImageAnalyzerTest < ActiveSupport::TestCase assert_equal 792, metadata[:width] assert_equal 584, metadata[:height] end + + test "analyzing an unsupported image type" do + blob = create_blob(data: "bad", filename: "bad_file.bad", content_type: "image/bad_type") + metadata = extract_metadata_from(blob) + + assert_nil metadata[:width] + assert_nil metadata[:heigh] + end end |