diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-11-27 03:12:34 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-11-27 03:12:34 +0000 |
| commit | 3b289a164386b994965d73a3c8aa61dc93181240 (patch) | |
| tree | cf79d88306a1bb5812bf3e00f255198bf001332e | |
| parent | 7f0b3161eab7d3a3de7103d83ba62ee05ec1c28f (diff) | |
| parent | f531099d2d504159de4695426339a1cd0ca7bb8d (diff) | |
Merge branch 'skip-kanji-mac' into 'develop'
Skip two unicode/kanji tests that can't pass on Mac.
See merge request pleroma/pleroma!3791
| -rw-r--r-- | test/pleroma/activity_test.exs | 1 | ||||
| -rw-r--r-- | test/pleroma/web/mastodon_api/controllers/search_controller_test.exs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/test/pleroma/activity_test.exs b/test/pleroma/activity_test.exs index e38384c9c..a48a68837 100644 --- a/test/pleroma/activity_test.exs +++ b/test/pleroma/activity_test.exs @@ -145,6 +145,7 @@ defmodule Pleroma.ActivityTest do setup do: clear_config([:instance, :limit_to_local_content]) + @tag :skip_on_mac test "finds utf8 text in statuses", %{ japanese_activity: japanese_activity, user: user diff --git a/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs index 9a5d88109..0a9240b70 100644 --- a/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs +++ b/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs @@ -37,6 +37,7 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do end end + @tag :skip_on_mac test "search", %{conn: conn} do user = insert(:user) user_two = insert(:user, %{nickname: "shp@shitposter.club"}) |