summaryrefslogtreecommitdiff
path: root/test/web/salmon
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-03-08 12:29:02 +0000
committerlambda <pleromagit@rogerbraun.net>2018-03-08 12:29:02 +0000
commit460062f2b04220ffcd8f20aa842cc95582d1f849 (patch)
treef56c298bed6b289aa2dd81766862265ccef05947 /test/web/salmon
parent0f2bf3eefb0adba13a3f3d37e8d8b1bd414a33e4 (diff)
parent611ca385dea3d611a97579000311cc42684305e6 (diff)
downloadpleroma-460062f2b04220ffcd8f20aa842cc95582d1f849.tar.gz
pleroma-460062f2b04220ffcd8f20aa842cc95582d1f849.zip
Merge branch 'feature/activitypub' into 'develop'
Feature/activitypub See merge request pleroma/pleroma!67
Diffstat (limited to 'test/web/salmon')
-rw-r--r--test/web/salmon/salmon_test.exs3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/web/salmon/salmon_test.exs b/test/web/salmon/salmon_test.exs
index a1ba45e35..cf70c908f 100644
--- a/test/web/salmon/salmon_test.exs
+++ b/test/web/salmon/salmon_test.exs
@@ -59,7 +59,6 @@ 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)
@@ -86,7 +85,7 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
"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)