aboutsummaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-01 12:38:46 +0000
committerlain <lain@soykaf.club>2020-05-01 12:38:46 +0000
commit44fbd09709b43a7eedff60365c3ff487dbd7a5c9 (patch)
tree493bfb7149594d5038473e08744bdfae1af87a2d /test/support
parent2008fa9c7fcefbb8b03ab797054c940f15da5e29 (diff)
parent7bd187bc5e2e589f3ba639bbc0ab2feea905a9b0 (diff)
downloadpleroma-44fbd09709b43a7eedff60365c3ff487dbd7a5c9.tar.gz
Merge branch 'issue/1577' into 'develop'
[#1577] fix mediaType of object See merge request pleroma/pleroma!2372
Diffstat (limited to 'test/support')
-rw-r--r--test/support/http_request_mock.ex16
1 files changed, 16 insertions, 0 deletions
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index 20cb2b3d1..9624cb0f7 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -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