fixing tests

Author: tclaus

app/jobs/workers/application_job.rb

@@ -6,7 +6,7 @@ class ApplicationJob < ActiveJob::Base
     retry_on ActiveRecord::Deadlocked
 
     # Most jobs are safe to ignore if the underlying records are no longer available
-    discard_on ActiveJob::DeserializationError
+    discard_on ActiveJob::DeserializationError, ActiveRecord::RecordNotUnique
 
     sidekiq_options retry: 5
   end

app/models/user_services/connecting.rb

@@ -47,7 +47,7 @@ def disconnect(contact)
     end
 
     def disconnected_by(person)
-      contact_for(person).try {|contact|
+      user.contact_for(person).try {|contact|
         disconnect_contact(contact, direction: :sharing, destroy: !contact.receiving)
       }
     end

app/models/user_services/querying.rb

@@ -45,8 +45,8 @@ def block_for(person)
     def aspects_with_shareable(base_class_name_or_class, shareable_id)
       base_class_name = base_class_name_or_class
       base_class_name = base_class_name_or_class.base_class.to_s if base_class_name_or_class.is_a?(Class)
-      aspects.joins(:aspect_visibilities).where(aspect_visibilities: {shareable_id:   shareable_id,
-                                                                      shareable_type: base_class_name})
+      user.aspects.joins(:aspect_visibilities).where(aspect_visibilities: {shareable_id:   shareable_id,
+                                                                           shareable_type: base_class_name})
     end
 
     def contact_for_person_id(person_id)

app/models/user_services/social_actions.rb

@@ -35,7 +35,7 @@ def like_comment!(target, opts={})
     def reshare!(target, opts={})
       raise I18n.t("reshares.create.error") if target.author.guid == user.guid
 
-      build_post(:reshare, root_guid: target.guid).tap do |reshare|
+      user.build_post(:reshare, root_guid: target.guid).tap do |reshare|
         reshare.text = opts[:text]
         reshare.save!
         update_or_create_participation!(target)

lib/diaspora/federation/dispatcher/public.rb

@@ -16,7 +16,7 @@ def deliver_to_remote(people)
 
           return if targets.empty?
 
-          Workers::SendPublicJob.perform_later(sender.id, entity.to_s, targets, magic_envelope.to_xml)
+          ::Workers::SendPublicJob.perform_later(sender.id, entity.to_s, targets, magic_envelope.to_xml)
         end
 
         def target_urls(people)

spec/models/user_services/querying_spec.rb

@@ -335,9 +335,9 @@
   end
 
   describe "#posts_from" do
-    before do
-      let(:user_charley) { create(:user) }
+    let(:user_charley) { create(:user) }
 
+    before do
       @aspect3 = user_charley.aspects.create(name: "bros")
 
       @public_message = user_charley.post(:status_message, text: "hey there", to: "all", public: true)