Merge branch 'issue/1577' into 'develop'

[#1577] fix mediaType of object

See merge request pleroma/pleroma!2372
This commit is contained in:
lain 2020-05-01 12:38:46 +00:00
commit 44fbd09709
5 changed files with 415 additions and 4 deletions

View file

@ -308,6 +308,22 @@ defmodule HttpRequestMock do
}}
end
def get("https://peertube.social/accounts/craigmaloney", _, _, _) do
{:ok,
%Tesla.Env{
status: 200,
body: File.read!("test/fixtures/tesla_mock/craigmaloney.json")
}}
end
def get("https://peertube.social/videos/watch/278d2b7c-0f38-4aaa-afe6-9ecc0c4a34fe", _, _, _) do
{:ok,
%Tesla.Env{
status: 200,
body: File.read!("test/fixtures/tesla_mock/peertube-social.json")
}}
end
def get("https://mobilizon.org/events/252d5816-00a3-4a89-a66f-15bf65c33e39", _, _, [
{"accept", "application/activity+json"}
]) do