Commit 5dd5f0b1 authored by Jonne Haß's avatar Jonne Haß

Merge branch 'release/0.5.0.0-RC' into develop

parents 0881810f 51c54caa
......@@ -152,11 +152,8 @@ GEM
devise (~> 3.4.0)
devise_lastseenable (0.0.4)
devise
devise
rails (>= 3.0.4)
rails (>= 3.0.4)
warden
warden
diaspora-vines (0.1.27)
activerecord (~> 4.1)
bcrypt (~> 3.1)
......
......@@ -10,7 +10,7 @@ module Workers
object = object_class_string.constantize.find(object_id)
receiver = Postzord::Receiver::LocalBatch.new(object, recipient_user_ids)
receiver.perform!
rescue ActiveRecord::NotFound # Already deleted before the job could run
rescue ActiveRecord::RecordNotFound # Already deleted before the job could run
end
end
end
require "spec_helper"
describe Workers::ReceiveLocalBatch do
it "calls the postzord" do
post = double
allow(Post).to receive(:find).with(1).and_return(post)
zord = double
expect(Postzord::Receiver::LocalBatch).to receive(:new).with(post, [2]).and_return(zord)
expect(zord).to receive(:perform!)
Workers::ReceiveLocalBatch.new.perform("Post", 1, [2])
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment