diff options
| -rw-r--r-- | app/models/concerns/file_attachment.rb | 7 | ||||
| -rw-r--r-- | test/controllers/assets_controller_test.rb | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/models/concerns/file_attachment.rb b/app/models/concerns/file_attachment.rb index 0e99fa2..86e5c68 100644 --- a/app/models/concerns/file_attachment.rb +++ b/app/models/concerns/file_attachment.rb | |||
| @@ -23,9 +23,10 @@ module FileAttachment | |||
| 23 | extend ActiveSupport::Concern | 23 | extend ActiveSupport::Concern |
| 24 | 24 | ||
| 25 | STYLES = { | 25 | STYLES = { |
| 26 | medium: { geometry: "300x300>", format: nil }, | 26 | medium: { geometry: "300x300>", format: nil }, |
| 27 | thumb: { geometry: "100x100>", format: nil }, | 27 | thumb: { geometry: "100x100>", format: nil }, |
| 28 | headline: { geometry: "460x250!", format: nil } | 28 | headline: { geometry: "460x250!", format: nil }, |
| 29 | large: { geometry: "1600x1600>", format: nil } | ||
| 29 | }.freeze | 30 | }.freeze |
| 30 | 31 | ||
| 31 | IMAGE_CONTENT_TYPES = %w[image/jpeg image/gif image/png image/webp].freeze | 32 | IMAGE_CONTENT_TYPES = %w[image/jpeg image/gif image/png image/webp].freeze |
diff --git a/test/controllers/assets_controller_test.rb b/test/controllers/assets_controller_test.rb index ea55c90..5f5f6e5 100644 --- a/test/controllers/assets_controller_test.rb +++ b/test/controllers/assets_controller_test.rb | |||
| @@ -62,8 +62,8 @@ class AssetsControllerTest < ActionController::TestCase | |||
| 62 | assert_equal 'image/png', asset.upload_content_type | 62 | assert_equal 'image/png', asset.upload_content_type |
| 63 | assert asset.upload_file_size > 0 | 63 | assert asset.upload_file_size > 0 |
| 64 | 64 | ||
| 65 | # original and all three variants should exist on disk | 65 | # original and all four variants should exist on disk |
| 66 | %w[original medium thumb headline].each do |style| | 66 | %w[original medium thumb headline large].each do |style| |
| 67 | path = Rails.root.join('public', 'system', 'uploads', | 67 | path = Rails.root.join('public', 'system', 'uploads', |
| 68 | asset.id.to_s, style, 'test_image.png') | 68 | asset.id.to_s, style, 'test_image.png') |
| 69 | assert File.exist?(path), "Expected #{style} variant at #{path}" | 69 | assert File.exist?(path), "Expected #{style} variant at #{path}" |
| @@ -91,7 +91,7 @@ class AssetsControllerTest < ActionController::TestCase | |||
| 91 | asset.id.to_s, 'original', 'test_document.pdf') | 91 | asset.id.to_s, 'original', 'test_document.pdf') |
| 92 | assert File.exist?(original_path), "Expected original at #{original_path}" | 92 | assert File.exist?(original_path), "Expected original at #{original_path}" |
| 93 | 93 | ||
| 94 | %w[medium thumb headline].each do |style| | 94 | %w[medium thumb headline large].each do |style| |
| 95 | path = Rails.root.join('public', 'system', 'uploads', | 95 | path = Rails.root.join('public', 'system', 'uploads', |
| 96 | asset.id.to_s, style, 'test_document.pdf') | 96 | asset.id.to_s, style, 'test_document.pdf') |
| 97 | assert !File.exist?(path), "Expected no #{style} variant for PDF" | 97 | assert !File.exist?(path), "Expected no #{style} variant for PDF" |
| @@ -161,6 +161,7 @@ class AssetsControllerTest < ActionController::TestCase | |||
| 161 | assert_equal "/system/uploads/#{asset.id}/thumb/logo.png", asset.upload.url(:thumb) | 161 | assert_equal "/system/uploads/#{asset.id}/thumb/logo.png", asset.upload.url(:thumb) |
| 162 | assert_equal "/system/uploads/#{asset.id}/medium/logo.png", asset.upload.url(:medium) | 162 | assert_equal "/system/uploads/#{asset.id}/medium/logo.png", asset.upload.url(:medium) |
| 163 | assert_equal "/system/uploads/#{asset.id}/headline/logo.png", asset.upload.url(:headline) | 163 | assert_equal "/system/uploads/#{asset.id}/headline/logo.png", asset.upload.url(:headline) |
| 164 | assert_equal "/system/uploads/#{asset.id}/large/logo.png", asset.upload.url(:large) | ||
| 164 | end | 165 | end |
| 165 | 166 | ||
| 166 | # --- login required --- | 167 | # --- login required --- |
