diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/pleroma/emoji_test.exs | 26 | ||||
| -rw-r--r-- | test/pleroma/user_test.exs | 8 | ||||
| -rw-r--r-- | test/pleroma/web/activity_pub/activity_pub_controller_test.exs | 10 | ||||
| -rw-r--r-- | test/pleroma/web/activity_pub/visibility_test.exs | 50 | ||||
| -rw-r--r-- | test/pleroma/web/common_api_test.exs | 24 | 
5 files changed, 59 insertions, 59 deletions
| diff --git a/test/pleroma/emoji_test.exs b/test/pleroma/emoji_test.exs index 18063c223..85f4e8bbf 100644 --- a/test/pleroma/emoji_test.exs +++ b/test/pleroma/emoji_test.exs @@ -6,26 +6,26 @@ defmodule Pleroma.EmojiTest do    use ExUnit.Case, async: true    alias Pleroma.Emoji -  describe "is_unicode_emoji?/1" do +  describe "unicode?/1" do      test "tells if a string is an unicode emoji" do -      refute Emoji.is_unicode_emoji?("X") -      refute Emoji.is_unicode_emoji?("ね") +      refute Emoji.unicode?("X") +      refute Emoji.unicode?("ね")        # Only accept fully-qualified (RGI) emoji        # See http://www.unicode.org/reports/tr51/ -      refute Emoji.is_unicode_emoji?("❤") -      refute Emoji.is_unicode_emoji?("☂") +      refute Emoji.unicode?("❤") +      refute Emoji.unicode?("☂") -      assert Emoji.is_unicode_emoji?("🥺") -      assert Emoji.is_unicode_emoji?("🤰") -      assert Emoji.is_unicode_emoji?("❤️") -      assert Emoji.is_unicode_emoji?("🏳️⚧️") -      assert Emoji.is_unicode_emoji?("🫵") +      assert Emoji.unicode?("🥺") +      assert Emoji.unicode?("🤰") +      assert Emoji.unicode?("❤️") +      assert Emoji.unicode?("🏳️⚧️") +      assert Emoji.unicode?("🫵")        # Additionally, we accept regional indicators. -      assert Emoji.is_unicode_emoji?("🇵") -      assert Emoji.is_unicode_emoji?("🇴") -      assert Emoji.is_unicode_emoji?("🇬") +      assert Emoji.unicode?("🇵") +      assert Emoji.unicode?("🇴") +      assert Emoji.unicode?("🇬")      end    end diff --git a/test/pleroma/user_test.exs b/test/pleroma/user_test.exs index 726982f1e..15809ad63 100644 --- a/test/pleroma/user_test.exs +++ b/test/pleroma/user_test.exs @@ -2424,20 +2424,20 @@ defmodule Pleroma.UserTest do      end    end -  describe "is_internal_user?/1" do +  describe "internal?/1" do      test "non-internal user returns false" do        user = insert(:user) -      refute User.is_internal_user?(user) +      refute User.internal?(user)      end      test "user with no nickname returns true" do        user = insert(:user, %{nickname: nil}) -      assert User.is_internal_user?(user) +      assert User.internal?(user)      end      test "user with internal-prefixed nickname returns true" do        user = insert(:user, %{nickname: "internal.test"}) -      assert User.is_internal_user?(user) +      assert User.internal?(user)      end    end diff --git a/test/pleroma/web/activity_pub/activity_pub_controller_test.exs b/test/pleroma/web/activity_pub/activity_pub_controller_test.exs index 069736925..ec4c04c62 100644 --- a/test/pleroma/web/activity_pub/activity_pub_controller_test.exs +++ b/test/pleroma/web/activity_pub/activity_pub_controller_test.exs @@ -221,7 +221,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do        user = insert(:user)        {:ok, post} = CommonAPI.post(user, %{status: "test", visibility: "local"}) -      assert Pleroma.Web.ActivityPub.Visibility.is_local_public?(post) +      assert Pleroma.Web.ActivityPub.Visibility.local_public?(post)        object = Object.normalize(post, fetch: false)        uuid = String.split(object.data["id"], "/") |> List.last() @@ -238,7 +238,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do        user = insert(:user)        {:ok, post} = CommonAPI.post(user, %{status: "test", visibility: "local"}) -      assert Pleroma.Web.ActivityPub.Visibility.is_local_public?(post) +      assert Pleroma.Web.ActivityPub.Visibility.local_public?(post)        object = Object.normalize(post, fetch: false)        uuid = String.split(object.data["id"], "/") |> List.last() @@ -259,7 +259,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do        {:ok, post} =          CommonAPI.post(user, %{status: "test @#{reader.nickname}", visibility: "local"}) -      assert Pleroma.Web.ActivityPub.Visibility.is_local_public?(post) +      assert Pleroma.Web.ActivityPub.Visibility.local_public?(post)        object = Object.normalize(post, fetch: false)        uuid = String.split(object.data["id"], "/") |> List.last() @@ -436,7 +436,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do        user = insert(:user)        {:ok, post} = CommonAPI.post(user, %{status: "test", visibility: "local"}) -      assert Pleroma.Web.ActivityPub.Visibility.is_local_public?(post) +      assert Pleroma.Web.ActivityPub.Visibility.local_public?(post)        uuid = String.split(post.data["id"], "/") |> List.last() @@ -452,7 +452,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do        user = insert(:user)        {:ok, post} = CommonAPI.post(user, %{status: "test", visibility: "local"}) -      assert Pleroma.Web.ActivityPub.Visibility.is_local_public?(post) +      assert Pleroma.Web.ActivityPub.Visibility.local_public?(post)        uuid = String.split(post.data["id"], "/") |> List.last() diff --git a/test/pleroma/web/activity_pub/visibility_test.exs b/test/pleroma/web/activity_pub/visibility_test.exs index 8c4c06a95..fd3dc83a1 100644 --- a/test/pleroma/web/activity_pub/visibility_test.exs +++ b/test/pleroma/web/activity_pub/visibility_test.exs @@ -52,60 +52,60 @@ defmodule Pleroma.Web.ActivityPub.VisibilityTest do      }    end -  test "is_direct?", %{ +  test "direct?", %{      public: public,      private: private,      direct: direct,      unlisted: unlisted,      list: list    } do -    assert Visibility.is_direct?(direct) -    refute Visibility.is_direct?(public) -    refute Visibility.is_direct?(private) -    refute Visibility.is_direct?(unlisted) -    assert Visibility.is_direct?(list) +    assert Visibility.direct?(direct) +    refute Visibility.direct?(public) +    refute Visibility.direct?(private) +    refute Visibility.direct?(unlisted) +    assert Visibility.direct?(list)    end -  test "is_public?", %{ +  test "public?", %{      public: public,      private: private,      direct: direct,      unlisted: unlisted,      list: list    } do -    refute Visibility.is_public?(direct) -    assert Visibility.is_public?(public) -    refute Visibility.is_public?(private) -    assert Visibility.is_public?(unlisted) -    refute Visibility.is_public?(list) +    refute Visibility.public?(direct) +    assert Visibility.public?(public) +    refute Visibility.public?(private) +    assert Visibility.public?(unlisted) +    refute Visibility.public?(list)    end -  test "is_private?", %{ +  test "private?", %{      public: public,      private: private,      direct: direct,      unlisted: unlisted,      list: list    } do -    refute Visibility.is_private?(direct) -    refute Visibility.is_private?(public) -    assert Visibility.is_private?(private) -    refute Visibility.is_private?(unlisted) -    refute Visibility.is_private?(list) +    refute Visibility.private?(direct) +    refute Visibility.private?(public) +    assert Visibility.private?(private) +    refute Visibility.private?(unlisted) +    refute Visibility.private?(list)    end -  test "is_list?", %{ +  test "list?", %{      public: public,      private: private,      direct: direct,      unlisted: unlisted,      list: list    } do -    refute Visibility.is_list?(direct) -    refute Visibility.is_list?(public) -    refute Visibility.is_list?(private) -    refute Visibility.is_list?(unlisted) -    assert Visibility.is_list?(list) +    refute Visibility.list?(direct) +    refute Visibility.list?(public) +    refute Visibility.list?(private) +    refute Visibility.list?(unlisted) +    assert Visibility.list?(list)    end    test "visible_for_user? Activity", %{ @@ -227,7 +227,7 @@ defmodule Pleroma.Web.ActivityPub.VisibilityTest do         } do      Repo.delete(user)      Pleroma.User.invalidate_cache(user) -    refute Visibility.is_private?(direct) +    refute Visibility.private?(direct)    end    test "get_visibility", %{ diff --git a/test/pleroma/web/common_api_test.exs b/test/pleroma/web/common_api_test.exs index f002172c5..20984eb08 100644 --- a/test/pleroma/web/common_api_test.exs +++ b/test/pleroma/web/common_api_test.exs @@ -506,7 +506,7 @@ defmodule Pleroma.Web.CommonAPITest do      {:ok, convo_reply} =        CommonAPI.post(user, %{status: ".", in_reply_to_conversation_id: participation.id}) -    assert Visibility.is_direct?(convo_reply) +    assert Visibility.direct?(convo_reply)      assert activity.data["context"] == convo_reply.data["context"]    end @@ -924,7 +924,7 @@ defmodule Pleroma.Web.CommonAPITest do        {:ok, activity} = CommonAPI.post(other_user, %{status: "cofe"})        {:ok, %Activity{} = announce_activity} = CommonAPI.repeat(activity.id, user) -      assert Visibility.is_public?(announce_activity) +      assert Visibility.public?(announce_activity)      end      test "can't repeat a repeat" do @@ -946,7 +946,7 @@ defmodule Pleroma.Web.CommonAPITest do        {:ok, %Activity{} = announce_activity} =          CommonAPI.repeat(activity.id, user, %{visibility: "private"}) -      assert Visibility.is_private?(announce_activity) +      assert Visibility.private?(announce_activity)        refute Visibility.visible_for_user?(announce_activity, nil)      end @@ -959,7 +959,7 @@ defmodule Pleroma.Web.CommonAPITest do        {:ok, %Activity{} = announce_activity} = CommonAPI.repeat(activity.id, author) -      assert Visibility.is_private?(announce_activity) +      assert Visibility.private?(announce_activity)        refute Visibility.visible_for_user?(announce_activity, nil)        assert Visibility.visible_for_user?(activity, follower) @@ -1604,7 +1604,7 @@ defmodule Pleroma.Web.CommonAPITest do        with_mock Pleroma.Web.Federator, publish: fn _ -> :ok end do          {:ok, activity} = CommonAPI.post(user, %{status: "#2hu #2HU", visibility: "local"}) -        assert Visibility.is_local_public?(activity) +        assert Visibility.local_public?(activity)          assert_not_called(Pleroma.Web.Federator.publish(activity))        end      end @@ -1619,7 +1619,7 @@ defmodule Pleroma.Web.CommonAPITest do          assert {:ok, %Activity{data: %{"deleted_activity_id" => ^activity_id}} = activity} =                   CommonAPI.delete(activity_id, user) -        assert Visibility.is_local_public?(activity) +        assert Visibility.local_public?(activity)          assert_not_called(Pleroma.Web.Federator.publish(activity))        end      end @@ -1635,7 +1635,7 @@ defmodule Pleroma.Web.CommonAPITest do          assert {:ok, %Activity{data: %{"type" => "Announce"}} = activity} =                   CommonAPI.repeat(activity_id, user) -        assert Visibility.is_local_public?(activity) +        assert Visibility.local_public?(activity)          refute called(Pleroma.Web.Federator.publish(activity))        end      end @@ -1653,7 +1653,7 @@ defmodule Pleroma.Web.CommonAPITest do          assert {:ok, %Activity{data: %{"type" => "Undo"}} = activity} =                   CommonAPI.unrepeat(activity_id, user) -        assert Visibility.is_local_public?(activity) +        assert Visibility.local_public?(activity)          refute called(Pleroma.Web.Federator.publish(activity))        end      end @@ -1668,7 +1668,7 @@ defmodule Pleroma.Web.CommonAPITest do          assert {:ok, %Activity{data: %{"type" => "Like"}} = activity} =                   CommonAPI.favorite(user, activity.id) -        assert Visibility.is_local_public?(activity) +        assert Visibility.local_public?(activity)          refute called(Pleroma.Web.Federator.publish(activity))        end      end @@ -1683,7 +1683,7 @@ defmodule Pleroma.Web.CommonAPITest do        with_mock Pleroma.Web.Federator, publish: fn _ -> :ok end do          assert {:ok, activity} = CommonAPI.unfavorite(activity.id, user) -        assert Visibility.is_local_public?(activity) +        assert Visibility.local_public?(activity)          refute called(Pleroma.Web.Federator.publish(activity))        end      end @@ -1697,7 +1697,7 @@ defmodule Pleroma.Web.CommonAPITest do          assert {:ok, %Activity{data: %{"type" => "EmojiReact"}} = activity} =                   CommonAPI.react_with_emoji(activity.id, user, "👍") -        assert Visibility.is_local_public?(activity) +        assert Visibility.local_public?(activity)          refute called(Pleroma.Web.Federator.publish(activity))        end      end @@ -1713,7 +1713,7 @@ defmodule Pleroma.Web.CommonAPITest do          assert {:ok, %Activity{data: %{"type" => "Undo"}} = activity} =                   CommonAPI.unreact_with_emoji(activity.id, user, "👍") -        assert Visibility.is_local_public?(activity) +        assert Visibility.local_public?(activity)          refute called(Pleroma.Web.Federator.publish(activity))        end      end | 
