summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-07-10 08:55:15 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-07-10 08:55:15 +0000
commit4ac6e6283f6e090588ad56066b1e552b895f3a24 (patch)
treec6536c1ab63ea26913b649cc3f64cea438b62f38 /test/support
parentc2be0da79fcc95399647b292e0b9a4119d3dcdf1 (diff)
parent5ea638757210c34b40fb568e537082b78f4118a6 (diff)
downloadpleroma-4ac6e6283f6e090588ad56066b1e552b895f3a24.tar.gz
pleroma-4ac6e6283f6e090588ad56066b1e552b895f3a24.zip
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
# Conflicts: # CHANGELOG.md
Diffstat (limited to 'test/support')
-rw-r--r--test/support/http_request_mock.ex12
1 files changed, 12 insertions, 0 deletions
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index da04ac6f1..19a202654 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -1342,6 +1342,18 @@ defmodule HttpRequestMock do
{:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/relay/relay.json")}}
end
+ def get("http://localhost:4001/", _, "", Accept: "text/html") do
+ {:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/tesla_mock/7369654.html")}}
+ end
+
+ def get("https://osada.macgirvin.com/", _, "", Accept: "text/html") do
+ {:ok,
+ %Tesla.Env{
+ status: 200,
+ body: File.read!("test/fixtures/tesla_mock/https___osada.macgirvin.com.html")
+ }}
+ end
+
def get(url, query, body, headers) do
{:error,
"Mock response not implemented for GET #{inspect(url)}, #{query}, #{inspect(body)}, #{