logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 356df7ae6b6edfc600fbc532f32fbc46314e00a0
parent: 8f03fdce7fa16fcaa829a40f395cefc85eb957d5
Author: Akihiko Odaki (@fn_aki@pawoo.net) <akihiko.odaki.4i@stu.hosei.ac.jp>
Date:   Wed, 21 Jun 2017 03:40:45 +0900

Update fabricator for MediaAttachment to attach a file according to type (#3862)

This fixes a random spec failures since commit
d55f207274648369cba30ff001aa3e354fa30dca.

Diffstat:

Mspec/fabricators/media_attachment_fabricator.rb14+++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/spec/fabricators/media_attachment_fabricator.rb b/spec/fabricators/media_attachment_fabricator.rb @@ -1,4 +1,16 @@ Fabricator(:media_attachment) do account - file { [attachment_fixture(['attachment.gif', 'attachment.jpg', 'attachment.webm'].sample), nil].sample } + file do |attrs| + [ + case attrs[:type] + when :gifv + attachment_fixture ['attachment.gif', 'attachment.webm'].sample + when :image + attachment_fixture 'attachment.jpg' + when nil + attachment_fixture ['attachment.gif', 'attachment.jpg', 'attachment.webm'].sample + end, + nil + ].sample + end end