mirror of
https://github.com/discourse/discourse.git
synced 2025-05-22 04:31:10 +08:00
FIX - don't attempt to optimized animated images (#11031)
* FIX - don't attempt to optimized animated images * ensure_safe_paths before calling ImageMagick
This commit is contained in:
@ -134,6 +134,9 @@ RSpec.describe UploadCreator do
|
||||
let(:small_filename) { "logo.png" }
|
||||
let(:small_file) { file_from_fixtures(small_filename) }
|
||||
|
||||
let(:animated_filename) { "animated.gif" }
|
||||
let(:animated_file) { file_from_fixtures(animated_filename) }
|
||||
|
||||
before do
|
||||
SiteSetting.png_to_jpg_quality = 1
|
||||
end
|
||||
@ -174,19 +177,37 @@ RSpec.describe UploadCreator do
|
||||
expect(upload.original_filename).to eq('should_be_jpeg.jpg')
|
||||
end
|
||||
|
||||
it 'should alter the image quality' do
|
||||
SiteSetting.png_to_jpg_quality = 75
|
||||
SiteSetting.recompress_original_jpg_quality = 40
|
||||
SiteSetting.image_preview_jpg_quality = 10
|
||||
context "jpeg image quality settings" do
|
||||
before do
|
||||
SiteSetting.png_to_jpg_quality = 75
|
||||
SiteSetting.recompress_original_jpg_quality = 40
|
||||
SiteSetting.image_preview_jpg_quality = 10
|
||||
end
|
||||
|
||||
upload = UploadCreator.new(file, filename, force_optimize: true).create_for(user.id)
|
||||
it 'should alter the image quality' do
|
||||
upload = UploadCreator.new(file, filename, force_optimize: true).create_for(user.id)
|
||||
|
||||
expect(image_quality(upload.url)).to eq(SiteSetting.recompress_original_jpg_quality)
|
||||
expect(image_quality(upload.url)).to eq(SiteSetting.recompress_original_jpg_quality)
|
||||
|
||||
upload.create_thumbnail!(100, 100)
|
||||
upload.reload
|
||||
upload.create_thumbnail!(100, 100)
|
||||
upload.reload
|
||||
|
||||
expect(image_quality(upload.optimized_images.first.url)).to eq(SiteSetting.image_preview_jpg_quality)
|
||||
expect(image_quality(upload.optimized_images.first.url)).to eq(SiteSetting.image_preview_jpg_quality)
|
||||
end
|
||||
|
||||
it 'should not convert animated images' do
|
||||
expect do
|
||||
UploadCreator.new(animated_file, animated_filename,
|
||||
force_optimize: true
|
||||
).create_for(user.id)
|
||||
end.to change { Upload.count }.by(1)
|
||||
|
||||
upload = Upload.last
|
||||
|
||||
expect(upload.extension).to eq('gif')
|
||||
expect(File.extname(upload.url)).to eq('.gif')
|
||||
expect(upload.original_filename).to eq('animated.gif')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user