summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-05-19 09:17:04 +0000
committerlambda <pleromagit@rogerbraun.net>2018-05-19 09:17:04 +0000
commit125d934bc6d8121f600e7fde9aae0a767f6aa66e (patch)
tree5ba75e7e156daf3be270d4dba47046b941b4ea9c /test/support
parent1d4bbec6b3239bb83b500a6a90e6686cb682cfac (diff)
parent6e8de2faae46f3dcaf6881ab40664da0057551e4 (diff)
downloadpleroma-125d934bc6d8121f600e7fde9aae0a767f6aa66e.tar.gz
pleroma-125d934bc6d8121f600e7fde9aae0a767f6aa66e.zip
Merge branch 'bugfix/hubzilla-compat' into 'develop'
hubzilla compatibility Closes #100 See merge request pleroma/pleroma!160
Diffstat (limited to 'test/support')
-rw-r--r--test/support/httpoison_mock.ex12
1 files changed, 12 insertions, 0 deletions
diff --git a/test/support/httpoison_mock.ex b/test/support/httpoison_mock.ex
index 4a5a9ea85..6bbae70e1 100644
--- a/test/support/httpoison_mock.ex
+++ b/test/support/httpoison_mock.ex
@@ -628,6 +628,18 @@ defmodule HTTPoisonMock do
}}
end
+ def get(
+ "https://hubzilla.example.org/channel/kaniini",
+ [Accept: "application/activity+json"],
+ _
+ ) do
+ {:ok,
+ %Response{
+ status_code: 200,
+ body: File.read!("test/fixtures/httpoison_mock/kaniini@hubzilla.example.org.json")
+ }}
+ end
+
def get("https://masto.quad.moe/users/_HellPie", [Accept: "application/activity+json"], _) do
{:ok,
%Response{