summaryrefslogtreecommitdiff
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-02 09:36:56 +0000
commitb2d776d77d25eaf8dc789005c856d86e4c38f86d (patch)
treec2ab9bffe8241884adad33a229991ebb45516337 /test
parent96de4bfbcacb963d85bd94781096e86bab3b7e0f (diff)
parent84fbf1616104c09e0f4f5442d86ca2c573ae4056 (diff)
downloadpleroma-b2d776d77d25eaf8dc789005c856d86e4c38f86d.tar.gz
pleroma-b2d776d77d25eaf8dc789005c856d86e4c38f86d.zip
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,