X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fsalmon%2Fsalmon_test.exs;h=1b39b4b2d70d4c15dfcf8a821a6491e5a1f6a304;hb=1027d1f6963b495a5abc67b05447619ce7d429db;hp=a1ba45e35ea10544379aa141a09f2e21b17083c1;hpb=b331cb449a46bbead19fea4fba59762c1a2e3a10;p=akkoma

diff --git a/test/web/salmon/salmon_test.exs b/test/web/salmon/salmon_test.exs
index a1ba45e35..1b39b4b2d 100644
--- a/test/web/salmon/salmon_test.exs
+++ b/test/web/salmon/salmon_test.exs
@@ -22,7 +22,7 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
   end
 
   test "generates an RSA private key pem" do
-    {:ok, key} = Salmon.generate_rsa_pem
+    {:ok, key} = Salmon.generate_rsa_pem()
     assert is_binary(key)
     assert Regex.match?(~r/RSA/, key)
   end
@@ -59,11 +59,11 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
   end
 
   test "it gets a magic key" do
-    # TODO: Make test local
     salmon = File.read!("test/fixtures/salmon2.xml")
     {:ok, key} = Salmon.fetch_magic_key(salmon)
 
-    assert key == "RSA.uzg6r1peZU0vXGADWxGJ0PE34WvmhjUmydbX5YYdOiXfODVLwCMi1umGoqUDm-mRu4vNEdFBVJU1CpFA7dKzWgIsqsa501i2XqElmEveXRLvNRWFB6nG03Q5OUY2as8eE54BJm0p20GkMfIJGwP6TSFb-ICp3QjzbatuSPJ6xCE=.AQAB"
+    assert key ==
+             "RSA.uzg6r1peZU0vXGADWxGJ0PE34WvmhjUmydbX5YYdOiXfODVLwCMi1umGoqUDm-mRu4vNEdFBVJU1CpFA7dKzWgIsqsa501i2XqElmEveXRLvNRWFB6nG03Q5OUY2as8eE54BJm0p20GkMfIJGwP6TSFb-ICp3QjzbatuSPJ6xCE=.AQAB"
   end
 
   test "it pushes an activity to remote accounts it's addressed to" do
@@ -76,23 +76,25 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
 
     mentioned_user = insert(:user, user_data)
     note = insert(:note)
+
     activity_data = %{
-      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id,
+      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
       "type" => "Create",
       "actor" => note.data["actor"],
       "to" => note.data["to"] ++ [mentioned_user.ap_id],
       "object" => note.data,
-      "published_at" => DateTime.utc_now() |> DateTime.to_iso8601,
+      "published_at" => DateTime.utc_now() |> DateTime.to_iso8601(),
       "context" => note.data["context"]
     }
 
-    {:ok, activity} = Repo.insert(%Activity{data: activity_data})
+    {:ok, activity} = Repo.insert(%Activity{data: activity_data, recipients: activity_data["to"]})
     user = Repo.get_by(User, ap_id: activity.data["actor"])
     {:ok, user} = Pleroma.Web.WebFinger.ensure_keys_present(user)
 
-    poster = fn (url, _data, _headers, _options) ->
+    poster = fn url, _data, _headers, _options ->
       assert url == "http://example.org/salmon"
     end
+
     Salmon.publish(user, activity, poster)
   end
 end