diff options
author | lain <lain@soykaf.club> | 2020-07-06 12:07:56 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-07-06 12:07:56 +0200 |
commit | ed4f9f6a29d8cf2dd31e41bae7e63aaa15bc9548 (patch) | |
tree | 82c5e8b4a40495485533b9c95668cef39ce909d2 /test/web/activity_pub/utils_test.exs | |
parent | a5bbfa21a1fabe97bfff1cc80348d2944319f3ad (diff) | |
parent | 69f0b286f7b3e0518ac7ae54dfb06539dc179698 (diff) | |
download | pleroma-ed4f9f6a29d8cf2dd31e41bae7e63aaa15bc9548.tar.gz pleroma-ed4f9f6a29d8cf2dd31e41bae7e63aaa15bc9548.zip |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json
Diffstat (limited to 'test/web/activity_pub/utils_test.exs')
-rw-r--r-- | test/web/activity_pub/utils_test.exs | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/test/web/activity_pub/utils_test.exs b/test/web/activity_pub/utils_test.exs index 15f03f193..2f9ecb5a3 100644 --- a/test/web/activity_pub/utils_test.exs +++ b/test/web/activity_pub/utils_test.exs @@ -27,16 +27,6 @@ defmodule Pleroma.Web.ActivityPub.UtilsTest do end end - describe "fetch the latest Block" do - test "fetches the latest Block activity" do - blocker = insert(:user) - blocked = insert(:user) - {:ok, activity} = ActivityPub.block(blocker, blocked) - - assert activity == Utils.fetch_latest_block(blocker, blocked) - end - end - describe "determine_explicit_mentions()" do test "works with an object that has mentions" do object = %{ @@ -344,9 +334,9 @@ defmodule Pleroma.Web.ActivityPub.UtilsTest do user1 = insert(:user) user2 = insert(:user) - assert {:ok, %Activity{} = _} = ActivityPub.block(user1, user2) - assert {:ok, %Activity{} = _} = ActivityPub.block(user1, user2) - assert {:ok, %Activity{} = activity} = ActivityPub.block(user1, user2) + assert {:ok, %Activity{} = _} = CommonAPI.block(user1, user2) + assert {:ok, %Activity{} = _} = CommonAPI.block(user1, user2) + assert {:ok, %Activity{} = activity} = CommonAPI.block(user1, user2) assert Utils.fetch_latest_block(user1, user2) == activity end |