squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix salmon tests.

Browse Source
This commit is contained in:
lain 2018-02-25 17:06:12 +01:00
parent 4d13cc0dc6
commit d3b0167854
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/pleroma/user.ex
View File

@ -410,8 +410,15 @@ defmodule Pleroma.User do
if user = get_by_ap_id(ap_id) do
user
else
with {:ok, user} <- ActivityPub.make_user_from_ap_id(ap_id) do
user
ap_try = ActivityPub.make_user_from_ap_id(ap_id)
case ap_try do
{:ok, user} -> user
_ ->
case OStatus.make_user(ap_id) do
{:ok, user} -> user
_ -> {:error, "Could not fetch by ap id"}
end
end
end
end

3
test/web/salmon/salmon_test.exs
View File

@ -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)