summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-09-03 10:34:06 -0500
committerMark Felder <feld@FreeBSD.org>2020-09-03 10:34:06 -0500
commit85446cc30c97a326d90b4ef719ba2e54c2ad423f (patch)
treecaa8e1268cbab2a09e414b85d2ce52b24249d0da /test/support
parent6ce28c409137972ee9b105b9d7ab4a0fd2a0d08b (diff)
parent9433311923d4b41b057ce6cb1632ff27d46919b4 (diff)
downloadpleroma-85446cc30c97a326d90b4ef719ba2e54c2ad423f.tar.gz
pleroma-85446cc30c97a326d90b4ef719ba2e54c2ad423f.zip
Merge branch 'develop' into media-preview-proxy
Diffstat (limited to 'test/support')
-rw-r--r--test/support/http_request_mock.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index eeeba7880..a0ebf65d9 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -1350,11 +1350,11 @@ 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
+ 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
+ def get("https://osada.macgirvin.com/", _, "", [{"accept", "text/html"}]) do
{:ok,
%Tesla.Env{
status: 200,