projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to resolve merge conflict
[akkoma]
/
test
/
support
/
httpoison_mock.ex
diff --git
a/test/support/httpoison_mock.ex
b/test/support/httpoison_mock.ex
index e3310bb5df66badb125b8aaaef435331ba246636..e7344500fb4ab6187eb937e98204a9208d2333b4 100644
(file)
--- a/
test/support/httpoison_mock.ex
+++ b/
test/support/httpoison_mock.ex
@@
-1,6
+1,8
@@
defmodule HTTPoisonMock do
alias HTTPoison.Response
defmodule HTTPoisonMock do
alias HTTPoison.Response
+ def process_request_options(options), do: options
+
def get(url, body \\ [], headers \\ [])
def get("https://prismo.news/@mxb", _, _) do
def get(url, body \\ [], headers \\ [])
def get("https://prismo.news/@mxb", _, _) do
@@
-56,6
+58,14
@@
defmodule HTTPoisonMock do
}}
end
}}
end
+ def get("https://info.pleroma.site/activity4.json", _, _) do
+ {:ok,
+ %Response{
+ status_code: 200,
+ body: File.read!("test/fixtures/httpoison_mock/https__info.pleroma.site_activity4.json")
+ }}
+ end
+
def get("https://info.pleroma.site/actor.json", _, _) do
{:ok,
%Response{
def get("https://info.pleroma.site/actor.json", _, _) do
{:ok,
%Response{