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

Merge branch 'bugfix/elixir-1.14' into 'develop'

Browse source 
Bugfix: Elixir 1.14

See merge request pleroma/pleroma!3740
This commit is contained in:
Haelwenn 2022-09-27 21:46:03 +00:00
commit 5d7d623390
5 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
View file

@ -944,7 +944,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
end
end
describe "hashtag timeline handling of :restrict_unauthenticated setting" do
describe "hashtag timeline handling of restrict_unauthenticated setting" do
setup do
user = insert(:user)
{:ok, activity1} = CommonAPI.post(user, %{status: "test #tag1"})

13
test/pleroma/web/media_proxy/invalidation/script_test.exs
View file

@ -10,11 +10,14 @@ defmodule Pleroma.Web.MediaProxy.Invalidation.ScriptTest do
test "it logs error when script is not found" do
assert capture_log(fn ->
assert Invalidation.Script.purge(
["http://example.com/media/example.jpg"],
script_path: "./example"
) == {:error, "%ErlangError{original: :enoent}"}
end) =~ "Error while cache purge: %ErlangError{original: :enoent}"
assert {:error, msg} =
Invalidation.Script.purge(
["http://example.com/media/example.jpg"],
script_path: "./example"
)
assert msg =~ ~r/%ErlangError{original: :enoent(, reason: nil)?}/
end) =~ ~r/Error while cache purge: %ErlangError{original: :enoent(, reason: nil)?}/
capture_log(fn ->
assert Invalidation.Script.purge(