aboutsummaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-05-01 18:40:41 +0200
committerlain <lain@soykaf.club>2019-05-01 18:40:41 +0200
commit45f790becc2cc63ac000c6432fe8c84e0b589822 (patch)
tree724d0e8ce5f10807cc25efc2434454bf38c5a52c /test/support
parent4908e0eeee2ecb58b204198c20720d52548b6f4a (diff)
parentd107919b3d8b2275ddb7b17846cab182682098a7 (diff)
downloadpleroma-45f790becc2cc63ac000c6432fe8c84e0b589822.tar.gz
Merge remote-tracking branch 'origin/develop' into conversations_three
Diffstat (limited to 'test/support')
-rw-r--r--test/support/http_request_mock.ex4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index d3b547d91..5b355bfe6 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -716,6 +716,10 @@ defmodule HttpRequestMock do
{:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/lambadalambda.atom")}}
end
+ def get("https://mastodon.social/users/lambadalambda", _, _, _) do
+ {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/lambadalambda.json")}}
+ end
+
def get("https://social.heldscal.la/user/23211", _, _, Accept: "application/activity+json") do
{:ok, Tesla.Mock.json(%{"id" => "https://social.heldscal.la/user/23211"}, status: 200)}
end