tests: simplify object fetching and containment tests

This commit is contained in:
Ariadne Conill 2019-10-18 00:51:53 +00:00
parent 597cb8897b
commit af9aa8e358
2 changed files with 4 additions and 19 deletions

View file

@ -65,7 +65,7 @@ defmodule Pleroma.Object.ContainmentTest do
assert capture_log(fn -> assert capture_log(fn ->
{:error, _} = User.get_or_fetch_by_ap_id("https://n1u.moe/users/rye") {:error, _} = User.get_or_fetch_by_ap_id("https://n1u.moe/users/rye")
end) =~ end) =~
"[error] Could not decode user at fetch https://n1u.moe/users/rye, {:error, :error}" "[error] Could not decode user at fetch https://n1u.moe/users/rye"
end end
end end

View file

@ -27,31 +27,16 @@ defmodule Pleroma.Object.FetcherTest do
end end
describe "actor origin containment" do describe "actor origin containment" do
test_with_mock "it rejects objects with a bogus origin", test "it rejects objects with a bogus origin" do
Pleroma.Web.OStatus,
[:passthrough],
[] do
{:error, _} = Fetcher.fetch_object_from_id("https://info.pleroma.site/activity.json") {:error, _} = Fetcher.fetch_object_from_id("https://info.pleroma.site/activity.json")
refute called(Pleroma.Web.OStatus.fetch_activity_from_url(:_))
end end
test_with_mock "it rejects objects when attributedTo is wrong (variant 1)", test "it rejects objects when attributedTo is wrong (variant 1)" do
Pleroma.Web.OStatus,
[:passthrough],
[] do
{:error, _} = Fetcher.fetch_object_from_id("https://info.pleroma.site/activity2.json") {:error, _} = Fetcher.fetch_object_from_id("https://info.pleroma.site/activity2.json")
refute called(Pleroma.Web.OStatus.fetch_activity_from_url(:_))
end end
test_with_mock "it rejects objects when attributedTo is wrong (variant 2)", test "it rejects objects when attributedTo is wrong (variant 2)" do
Pleroma.Web.OStatus,
[:passthrough],
[] do
{:error, _} = Fetcher.fetch_object_from_id("https://info.pleroma.site/activity3.json") {:error, _} = Fetcher.fetch_object_from_id("https://info.pleroma.site/activity3.json")
refute called(Pleroma.Web.OStatus.fetch_activity_from_url(:_))
end end
end end