Merge branch 'next-minor' into develop

6 files changed, 14 insertions, 16 deletions

diff --git a/spec/integration/receiving_spec.rb b/spec/integration/receiving_spec.rb
index e7a44cfbc..6a16bd8da 100644
--- a/spec/integration/receiving_spec.rb
+++ b/spec/integration/receiving_spec.rb
@@ -28,7 +28,7 @@ describe 'a user receives a post', :type => :request do
       bob.aspects.reload
       bob.add_to_streams(sm, [@bobs_aspect])
       queue.drain_all
-      bob.dispatch_post(sm, :to => @bobs_aspect)
+      bob.dispatch_post(sm)
     end
 
     expect(alice.visible_shareables(Post).count(:all)).to eq(1)
diff --git a/spec/lib/diaspora/federated/contact_retraction_spec.rb b/spec/lib/diaspora/federated/contact_retraction_spec.rb
index c24b35b5b..29211629a 100644
--- a/spec/lib/diaspora/federated/contact_retraction_spec.rb
+++ b/spec/lib/diaspora/federated/contact_retraction_spec.rb
@@ -53,7 +53,7 @@ describe ContactRetraction do
       federation_retraction_data = Diaspora::Federation::Entities.contact(contact).to_h
 
       expect(Workers::DeferredRetraction).to receive(:perform_async).with(
-        local_luke.id, "ContactRetraction", federation_retraction_data, [remote_raphael.id], {}
+        local_luke.id, "ContactRetraction", federation_retraction_data.deep_stringify_keys, [remote_raphael.id], {}
       )
 
       retraction.defer_dispatch(local_luke)
diff --git a/spec/lib/diaspora/federated/retraction_spec.rb b/spec/lib/diaspora/federated/retraction_spec.rb
index 615de2a42..8da330007 100644
--- a/spec/lib/diaspora/federated/retraction_spec.rb
+++ b/spec/lib/diaspora/federated/retraction_spec.rb
@@ -70,7 +70,8 @@ describe Retraction do
       federation_retraction = Diaspora::Federation::Entities.retraction(retraction)
 
       expect(Workers::DeferredRetraction).to receive(:perform_async).with(
-        local_luke.id, "Retraction", federation_retraction.to_h, [remote_raphael.id], service_types: []
+        local_luke.id, "Retraction", federation_retraction.to_h.deep_stringify_keys, [remote_raphael.id],
+        "service_types" => []
       )
 
       retraction.defer_dispatch(local_luke)
@@ -85,7 +86,8 @@ describe Retraction do
       federation_retraction = Diaspora::Federation::Entities.retraction(retraction)
 
       expect(Workers::DeferredRetraction).to receive(:perform_async).with(
-        alice.id, "Retraction", federation_retraction.to_h, [], service_types: ["Services::Twitter"], tweet_id: "123"
+        alice.id, "Retraction", federation_retraction.to_h.deep_stringify_keys, [],
+        "service_types" => ["Services::Twitter"], "tweet_id" => "123"
       )
 
       retraction.defer_dispatch(alice)
@@ -96,7 +98,7 @@ describe Retraction do
       federation_retraction = Diaspora::Federation::Entities.retraction(retraction)
 
       expect(Workers::DeferredRetraction).to receive(:perform_async).with(
-        alice.id, "Retraction", federation_retraction.to_h, [], service_types: []
+        alice.id, "Retraction", federation_retraction.to_h.deep_stringify_keys, [], "service_types" => []
       )
 
       retraction.defer_dispatch(alice)
@@ -109,7 +111,7 @@ describe Retraction do
       federation_retraction = Diaspora::Federation::Entities.retraction(retraction)
 
       expect(Workers::DeferredRetraction).to receive(:perform_async).with(
-        local_luke.id, "Retraction", federation_retraction.to_h, [remote_raphael.id], {}
+        local_luke.id, "Retraction", federation_retraction.to_h.deep_stringify_keys, [remote_raphael.id], {}
       )
 
       retraction.defer_dispatch(local_luke)
@@ -124,7 +126,7 @@ describe Retraction do
         federation_retraction = Diaspora::Federation::Entities.retraction(retraction)
 
         expect(Workers::DeferredRetraction).to receive(:perform_async).with(
-          local_luke.id, "Retraction", federation_retraction.to_h, [remote_raphael.id], {}
+          local_luke.id, "Retraction", federation_retraction.to_h.deep_stringify_keys, [remote_raphael.id], {}
         )
 
         retraction.defer_dispatch(local_luke)
@@ -135,7 +137,7 @@ describe Retraction do
         federation_retraction = Diaspora::Federation::Entities.retraction(retraction)
 
         expect(Workers::DeferredRetraction).to receive(:perform_async).with(
-          local_luke.id, "Retraction", federation_retraction.to_h, [], {}
+          local_luke.id, "Retraction", federation_retraction.to_h.deep_stringify_keys, [], {}
         )
 
         retraction.defer_dispatch(local_luke, false)
diff --git a/spec/lib/diaspora/federation/dispatcher_spec.rb b/spec/lib/diaspora/federation/dispatcher_spec.rb
index 2b11d6363..a48631100 100644
--- a/spec/lib/diaspora/federation/dispatcher_spec.rb
+++ b/spec/lib/diaspora/federation/dispatcher_spec.rb
@@ -57,7 +57,8 @@ describe Diaspora::Federation::Dispatcher do
 
   describe ".defer_dispatch" do
     it "queues a job for dispatch" do
-      expect(Workers::DeferredDispatch).to receive(:perform_async).with(alice.id, "StatusMessage", post.id, opts)
+      expect(Workers::DeferredDispatch)
+        .to receive(:perform_async).with(alice.id, "StatusMessage", post.id, opts.deep_stringify_keys)
       described_class.defer_dispatch(alice, post, opts)
     end
   end
diff --git a/spec/shared_behaviors/dispatcher.rb b/spec/shared_behaviors/dispatcher.rb
index 2b42dec00..c99e66228 100644
--- a/spec/shared_behaviors/dispatcher.rb
+++ b/spec/shared_behaviors/dispatcher.rb
@@ -17,7 +17,7 @@ shared_examples "a dispatcher" do
 
       it "delivers a Retraction of a Post to specified services" do
         opts = {service_types: "Services::Twitter", tweet_id: "123"}
-        expect(Workers::DeletePostFromService).to receive(:perform_async).with(twitter.id, opts)
+        expect(Workers::DeletePostFromService).to receive(:perform_async).with(twitter.id, opts.deep_stringify_keys)
 
         retraction = Retraction.for(post)
         Diaspora::Federation::Dispatcher.build(alice, retraction, opts).dispatch
diff --git a/spec/support/user_methods.rb b/spec/support/user_methods.rb
index fa11bfb66..c96129680 100644
--- a/spec/support/user_methods.rb
+++ b/spec/support/user_methods.rb
@@ -32,12 +32,7 @@ class User
 
       if p.save!
         self.aspects.reload
-
-        dispatch_opts = {
-          url: Rails.application.routes.url_helpers.post_url(p, host: AppConfig.pod_uri.to_s),
-          to:  opts[:to]
-        }
-        dispatch_post(p, dispatch_opts)
+        dispatch_post(p, url: Rails.application.routes.url_helpers.post_url(p, host: AppConfig.pod_uri.to_s))
       end
       unless opts[:created_at]
         p.created_at = Time.now - 1