summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-10-17 19:33:15 +0000
committerkaniini <nenolod@gmail.com>2018-10-17 19:33:15 +0000
commit6098070234f7d84a32cc918d709efd07520e0b99 (patch)
tree78157b0cb4c60fc024f4dbc0041db1d7dd53487f /test/support
parentc7140c67c7eed28222a4351c1132b44faf1f7ce7 (diff)
parent958c5e02e8ba37a5412c46f944e0e8458b125ee8 (diff)
downloadpleroma-6098070234f7d84a32cc918d709efd07520e0b99.tar.gz
pleroma-6098070234f7d84a32cc918d709efd07520e0b99.zip
Merge branch 'bugfix/osada-mention' into 'develop'
fix osada mentions Closes #324 See merge request pleroma/pleroma!380
Diffstat (limited to 'test/support')
-rw-r--r--test/support/httpoison_mock.ex21
1 files changed, 21 insertions, 0 deletions
diff --git a/test/support/httpoison_mock.ex b/test/support/httpoison_mock.ex
index d8b79abef..75c78d70e 100644
--- a/test/support/httpoison_mock.ex
+++ b/test/support/httpoison_mock.ex
@@ -3,6 +3,27 @@ defmodule HTTPoisonMock do
def get(url, body \\ [], headers \\ [])
+ def get("https://osada.macgirvin.com/channel/mike", _, _) do
+ {:ok,
+ %Response{
+ status_code: 200,
+ body:
+ File.read!("test/fixtures/httpoison_mock/https___osada.macgirvin.com_channel_mike.json")
+ }}
+ end
+
+ def get(
+ "https://osada.macgirvin.com/.well-known/webfinger?resource=acct:mike@osada.macgirvin.com",
+ _,
+ _
+ ) do
+ {:ok,
+ %Response{
+ status_code: 200,
+ body: File.read!("test/fixtures/httpoison_mock/mike@osada.macgirvin.com.json")
+ }}
+ end
+
def get("https://info.pleroma.site/activity.json", _, _) do
{:ok,
%Response{