hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'http-fixes' into 'develop'

Browse source 
Improvements and fixes for http requests

See merge request pleroma/pleroma!2904
This commit is contained in:
rinpatch 2020-09-02 09:36:56 +00:00
commit b2d776d77d
13 changed files with 95 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/support/http_request_mock.ex
View file

@ -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,