aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-09-02 09:36:56 +0000
committerrinpatch <rinpatch@sdf.org>2020-09-08 13:53:16 +0300
commitdccbed856df131900bf7851fbd11c518f85bce7a (patch)
tree7d4d7c42ef5156cd24ea06f9316895b0860ce9b2 /test
parentea4b6c64d60d1dc3246f5a2f23a2e3a47e8fb476 (diff)
downloadpleroma-dccbed856df131900bf7851fbd11c518f85bce7a.tar.gz
Merge branch 'http-fixes' into 'develop'
Improvements and fixes for http requests See merge request pleroma/pleroma!2904
Diffstat (limited to 'test')
-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,