logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 3b289a164386b994965d73a3c8aa61dc93181240
parent 7f0b3161eab7d3a3de7103d83ba62ee05ec1c28f
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Sun, 27 Nov 2022 03:12:34 +0000

Merge branch 'skip-kanji-mac' into 'develop'

Skip two unicode/kanji tests that can't pass on Mac.

See merge request pleroma/pleroma!3791

Diffstat:

Mtest/pleroma/activity_test.exs1+
Mtest/pleroma/web/mastodon_api/controllers/search_controller_test.exs1+
2 files changed, 2 insertions(+), 0 deletions(-)

diff --git 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 @@ -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"})