diff options
author | David Yip <yipdw@member.fsf.org> | 2017-10-26 09:18:27 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-10-26 09:18:27 -0500 |
commit | dd28b94cf0ed1ed3b2d75fddb27fc4373298d659 (patch) | |
tree | 96e2517363e43e7d435bc1204b97e4769d5a3e20 /spec/models/media_attachment_spec.rb | |
parent | a2612d0d3865fbbd6e8a93572f6d4e4044a8d64b (diff) | |
parent | d556be2968641c265360297fd268a24119c68670 (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'spec/models/media_attachment_spec.rb')
-rw-r--r-- | spec/models/media_attachment_spec.rb | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb index 9fce5bc4f..435b4f326 100644 --- a/spec/models/media_attachment_spec.rb +++ b/spec/models/media_attachment_spec.rb @@ -20,20 +20,29 @@ RSpec.describe MediaAttachment, type: :model do end describe 'non-animated gif non-conversion' do - let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture('attachment.gif')) } + fixtures = [ + { filename: 'attachment.gif', width: 600, height: 400, aspect: 1.5 }, + { filename: 'mini-static.gif', width: 32, height: 32, aspect: 1.0 }, + ] - it 'sets type to image' do - expect(media.type).to eq 'image' - end + fixtures.each do |fixture| + context fixture[:filename] do + let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture(fixture[:filename])) } - it 'leaves original file as-is' do - expect(media.file_content_type).to eq 'image/gif' - end + it 'sets type to image' do + expect(media.type).to eq 'image' + end - it 'sets meta' do - expect(media.file.meta["original"]["width"]).to eq 600 - expect(media.file.meta["original"]["height"]).to eq 400 - expect(media.file.meta["original"]["aspect"]).to eq 1.5 + it 'leaves original file as-is' do + expect(media.file_content_type).to eq 'image/gif' + end + + it 'sets meta' do + expect(media.file.meta["original"]["width"]).to eq fixture[:width] + expect(media.file.meta["original"]["height"]).to eq fixture[:height] + expect(media.file.meta["original"]["aspect"]).to eq fixture[:aspect] + end + end end end |