nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into issue_5149

Browse source 
Conflicts:
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/conversations_controller_spec.rb
	spec/controllers/people_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/integration/receiving_spec.rb
	spec/lib/postzord/receiver/public_spec.rb
	spec/models/post_spec.rb
	spec/models/user/querying_spec.rb
This commit is contained in:
khall 2014-08-25 13:58:39 -07:00
parent 4edd824d3c
commit c27b38d69a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spec/lib/postzord/receiver/public_spec.rb
View file

@ -61,7 +61,7 @@ describe Postzord::Receiver::Public do
@receiver.perform! @receiver.perform!
end end
it 'enqueues a Workers::ReceiveLocalBatch' do it 'enqueues a Workers::ReceiveLocalBatch' do
expect(Workers::ReceiveLocalBatch).to receive(:perform_async).with(anything, anything, anything) expect(Workers::ReceiveLocalBatch).to receive(:perform_async).with(anything, anything, anything)
@receiver.perform! @receiver.perform!
end end