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

diff --git a/test/web/salmon/salmon_test.exs b/test/web/salmon/salmon_test.exs
index a1ba45e35..265e1abbd 100644
--- a/test/web/salmon/salmon_test.exs
+++ b/test/web/salmon/salmon_test.exs
@@ -1,7 +1,13 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.Salmon.SalmonTest do
   use Pleroma.DataCase
+  alias Pleroma.Activity
+  alias Pleroma.Repo
+  alias Pleroma.User
   alias Pleroma.Web.Salmon
-  alias Pleroma.{Repo, Activity, User}
   import Pleroma.Factory
 
   @magickey "RSA.pu0s-halox4tu7wmES1FVSx6u-4wc0YrUFXcqWXZG4-27UmbCOpMQftRCldNRfyA-qLbz-eqiwQhh-1EwUvjsD4cYbAHNGHwTvDOyx5AKthQUP44ykPv7kjKGh3DWKySJvcs9tlUG87hlo7AvnMo9pwRS_Zz2CacQ-MKaXyDepk=.AQAB"
@@ -10,6 +16,11 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
 
   @magickey_friendica "RSA.AMwa8FUs2fWEjX0xN7yRQgegQffhBpuKNC6fa5VNSVorFjGZhRrlPMn7TQOeihlc9lBz2OsHlIedbYn2uJ7yCs0.AQAB"
 
+  setup_all do
+    Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
+    :ok
+  end
+
   test "decodes a salmon" do
     {:ok, salmon} = File.read("test/fixtures/salmon.xml")
     {:ok, doc} = Salmon.decode_and_validate(@magickey, salmon)
@@ -22,7 +33,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,40 +70,42 @@ 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
     user_data = %{
       info: %{
-        "salmon" => "http://example.org/salmon"
+        salmon: "http://test-example.org/salmon"
       },
       local: false
     }
 
     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) ->
-      assert url == "http://example.org/salmon"
+    poster = fn url, _data, _headers ->
+      assert url == "http://test-example.org/salmon"
     end
+
     Salmon.publish(user, activity, poster)
   end
 end