diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-09-27 21:46:03 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-09-27 21:46:03 +0000 |
commit | 5d7d6233905f280c9d52cf1fc15e8f54280a3e58 (patch) | |
tree | 62da97ad913f3fc92a404c6e3b4efb7cdcc42431 /test/pleroma/web | |
parent | ac95b8b4f3dda961e13745e1f07990e3ccc37bb9 (diff) | |
parent | ec80a1e405c7b1d893c08ea99e824f2c13719c3a (diff) | |
download | pleroma-5d7d6233905f280c9d52cf1fc15e8f54280a3e58.tar.gz |
Merge branch 'bugfix/elixir-1.14' into 'develop'
Bugfix: Elixir 1.14
See merge request pleroma/pleroma!3740
Diffstat (limited to 'test/pleroma/web')
-rw-r--r-- | test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs | 2 | ||||
-rw-r--r-- | test/pleroma/web/media_proxy/invalidation/script_test.exs | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs index 1328b42c9..b13a8033b 100644 --- a/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs +++ b/test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs @@ -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"}) diff --git a/test/pleroma/web/media_proxy/invalidation/script_test.exs b/test/pleroma/web/media_proxy/invalidation/script_test.exs index 39ef365f4..3e8fd751d 100644 --- a/test/pleroma/web/media_proxy/invalidation/script_test.exs +++ b/test/pleroma/web/media_proxy/invalidation/script_test.exs @@ -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( |