From 5b20c992ae55a0fa5f5361c41c14ef4634dbcd15 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 3 May 2016 12:13:23 +0200 Subject: [PATCH] Let activerecord handle the picture upload in factories --- spec/factories/conferences.rb | 8 ++++---- spec/factories/sponsors.rb | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/spec/factories/conferences.rb b/spec/factories/conferences.rb index c7c07bb8..93089cce 100644 --- a/spec/factories/conferences.rb +++ b/spec/factories/conferences.rb @@ -46,10 +46,10 @@ FactoryGirl.define do create(:question, conferences: [conference]) # Logo... - uploader = PictureUploader.new(conference, :picture) - File.open('app/assets/images/rails.png') { |f| uploader.store!(f) } - conference.logo_file_name = 'rails.png' - conference.save + File.open("spec/support/logos/#{1 + rand(13)}.png") do |file| + conference.picture = file + end + conference.save! end end end diff --git a/spec/factories/sponsors.rb b/spec/factories/sponsors.rb index dd074ab3..5d531991 100644 --- a/spec/factories/sponsors.rb +++ b/spec/factories/sponsors.rb @@ -9,11 +9,10 @@ FactoryGirl.define do sponsorship_level after(:create) do |sponsor| - logo = "#{1 + rand(13)}.png" - uploader = PictureUploader.new(sponsor, :picture) - File.open("spec/support/logos/#{logo}") { |f| uploader.store!(f) } - sponsor.logo_file_name = logo.to_s - sponsor.save + File.open("spec/support/logos/#{1 + rand(13)}.png") do |file| + sponsor.picture = file + end + sponsor.save! end end end