summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-09-03 11:29:39 +0200
committerlain <lain@soykaf.club>2020-09-03 11:29:39 +0200
commitf26b580e80e57f162442e6f0c3bc0072cb935ce3 (patch)
tree3aad914a705da3574c3924c7dc6915965c2e3ad7 /test/support
parent0a9c63fb4351ed29a521697f2c584b0ae007696c (diff)
parentd1a6f67b1d92e17f4fe3cfc8f296879326897220 (diff)
downloadpleroma-f26b580e80e57f162442e6f0c3bc0072cb935ce3.tar.gz
pleroma-f26b580e80e57f162442e6f0c3bc0072cb935ce3.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma-fix_install_fe_bug
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,