Fix salmon tests.
This commit is contained in:
parent
4d13cc0dc6
commit
d3b0167854
@ -410,8 +410,15 @@ defmodule Pleroma.User do
|
|||||||
if user = get_by_ap_id(ap_id) do
|
if user = get_by_ap_id(ap_id) do
|
||||||
user
|
user
|
||||||
else
|
else
|
||||||
with {:ok, user} <- ActivityPub.make_user_from_ap_id(ap_id) do
|
ap_try = ActivityPub.make_user_from_ap_id(ap_id)
|
||||||
user
|
|
||||||
|
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
|
end
|
||||||
end
|
end
|
||||||
|
@ -59,7 +59,6 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
|
|||||||
end
|
end
|
||||||
|
|
||||||
test "it gets a magic key" do
|
test "it gets a magic key" do
|
||||||
# TODO: Make test local
|
|
||||||
salmon = File.read!("test/fixtures/salmon2.xml")
|
salmon = File.read!("test/fixtures/salmon2.xml")
|
||||||
{:ok, key} = Salmon.fetch_magic_key(salmon)
|
{:ok, key} = Salmon.fetch_magic_key(salmon)
|
||||||
|
|
||||||
@ -86,7 +85,7 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
|
|||||||
"context" => note.data["context"]
|
"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"])
|
user = Repo.get_by(User, ap_id: activity.data["actor"])
|
||||||
{:ok, user} = Pleroma.Web.WebFinger.ensure_keys_present(user)
|
{:ok, user} = Pleroma.Web.WebFinger.ensure_keys_present(user)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user