diff --git a/app/models/jobs/process_photo.rb b/app/models/jobs/process_photo.rb index 04cd3c1e8..2c42f3b93 100644 --- a/app/models/jobs/process_photo.rb +++ b/app/models/jobs/process_photo.rb @@ -7,14 +7,7 @@ module Job class ProcessPhoto < Base @queue = :photos def self.perform_delegate(photo_id) - begin Photo.find(photo_id).image.post_process - rescue Exception => e - puts e.inspect - - ensure - puts "photo has been processed" - end end end end diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb index e3cdaf509..0ec18ffe7 100644 --- a/spec/models/photo_spec.rb +++ b/spec/models/photo_spec.rb @@ -35,6 +35,15 @@ describe Photo do end end + describe 'after create' do + it 'calls #queue_processing_job' do + p = Factory.build(:photo, :image => File.open(@fixture_name)) + p.should_receive(:queue_processing_job) + + p.save! + end + end + it 'is mutable' do @photo.mutable?.should == true end @@ -124,6 +133,7 @@ describe Photo do @xml.include?(@user.diaspora_handle).should be true end end + describe 'remote photos' do it 'should set the remote_photo on marshalling' do @photo.image.store! File.open(@fixture_name)