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

Merge branch 'develop' into 'public-polls'

Browse source 
# Conflicts:
#   docs/development/API/differences_in_mastoapi_responses.md
This commit is contained in:
Haelwenn 2024-01-21 12:03:29 +00:00
commit ab3f03a04a
482 changed files with 4326 additions and 1430 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/support/http_request_mock.ex
View file

@ -21,7 +21,7 @@ defmodule HttpRequestMock do
else
error ->
with {:error, message} <- error do
Logger.warn(to_string(message))
Logger.warning(to_string(message))
end
{_, _r} = error
@ -178,7 +178,7 @@ defmodule HttpRequestMock do
end
def get(
"https://social.heldscal.la/.well-known/webfinger?resource=nonexistant@social.heldscal.la",
"https://social.heldscal.la/.well-known/webfinger?resource=nonexistent@social.heldscal.la",
_,
_,
[{"accept", "application/xrd+xml,application/jrd+json"}]
@ -186,7 +186,7 @@ defmodule HttpRequestMock do
{:ok,
%Tesla.Env{
status: 200,
body: File.read!("test/fixtures/tesla_mock/nonexistant@social.heldscal.la.xml")
body: File.read!("test/fixtures/tesla_mock/nonexistent@social.heldscal.la.xml")
}}
end