summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-06-03 12:19:19 +0000
committerrinpatch <rinpatch@sdf.org>2019-06-03 12:19:19 +0000
commit9789e000b05621435dc0c03833f564481e0b80e6 (patch)
treee2625834287cb13a3951c93886ae080ed58c1484 /test/support
parentd33d248b69c77a7ab712cfe4b727c0000a77f4ea (diff)
parentdc91bcc0afc82ddd52a617352e0e4e89e1a1d61c (diff)
downloadpleroma-9789e000b05621435dc0c03833f564481e0b80e6.tar.gz
pleroma-9789e000b05621435dc0c03833f564481e0b80e6.zip
Merge branch 'feature/polls-2-electric-boogalo' into 'develop'
Polls 2 Electric Boogalo Closes #657 See merge request pleroma/pleroma!1190
Diffstat (limited to 'test/support')
-rw-r--r--test/support/http_request_mock.ex8
1 files changed, 8 insertions, 0 deletions
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index 66d7d5ba9..36b9265e7 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -52,6 +52,14 @@ defmodule HttpRequestMock do
}}
end
+ def get("https://mastodon.sdf.org/users/rinpatch", _, _, _) do
+ {:ok,
+ %Tesla.Env{
+ status: 200,
+ body: File.read!("test/fixtures/httpoison_mock/rinpatch.json")
+ }}
+ end
+
def get(
"https://mastodon.social/.well-known/webfinger?resource=https://mastodon.social/users/emelie",
_,