Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix #2108 - Fix gif uploads (#2171)

Browse source 
* Fix #2108 - Fix gif uploads
Add specs for media attachment gifv conversion

* Add ffmpeg to travis

* Make travis install ffmpeg, not libav

* Switch travis to trusty
This commit is contained in:
Eugen 2017-04-19 23:21:00 +02:00 • committed by GitHub
parent 0876a06e45
commit 2e4afccd9d
5 changed files with 44 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
spec/models/media_attachment_spec.rb
View file

@ -1,5 +1,27 @@
require 'rails_helper'
RSpec.describe MediaAttachment, type: :model do
describe 'animated gif conversion' do
let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture('avatar.gif')) }
it 'sets type to gifv' do
expect(media.type).to eq 'gifv'
end
it 'converts original file to mp4' do
expect(media.file_content_type).to eq 'video/mp4'
end
end
describe 'non-animated gif non-conversion' do
let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture('attachment.gif')) }
it 'sets type to image' do
expect(media.type).to eq 'image'
end
it 'leaves original file as-is' do
expect(media.file_content_type).to eq 'image/gif'
end
end
end