aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/list_test.exs18
-rw-r--r--test/web/common_api/common_api_test.exs6
2 files changed, 4 insertions, 20 deletions
diff --git a/test/list_test.exs b/test/list_test.exs
index 0e72b6660..6c5c6b197 100644
--- a/test/list_test.exs
+++ b/test/list_test.exs
@@ -114,22 +114,10 @@ defmodule Pleroma.ListTest do
refute not_owned_list in lists_2
end
- test "get ap_id by user nickname and list id" do
- nickname = "foo"
- list_id = 42
-
- expected = Pleroma.Web.Endpoint.url() <> "/users/#{nickname}/lists/#{list_id}"
-
- assert Pleroma.List.ap_id(%Pleroma.User{nickname: nickname}, list_id) == expected
- assert Pleroma.List.ap_id({nickname, list_id}) == expected
- end
-
test "get by ap_id" do
user = insert(:user)
{:ok, list} = Pleroma.List.create("foo", user)
- ap_id = Pleroma.List.ap_id(user, list.id)
-
- assert Pleroma.List.get_by_ap_id(ap_id) == list
+ assert Pleroma.List.get_by_ap_id(list.ap_id) == list
end
test "memberships" do
@@ -138,8 +126,6 @@ defmodule Pleroma.ListTest do
{:ok, list} = Pleroma.List.create("foo", user)
{:ok, list} = Pleroma.List.follow(list, member)
- list_ap_id = Pleroma.List.ap_id(user, list.id)
-
- assert Pleroma.List.memberships(member) == [list_ap_id]
+ assert Pleroma.List.memberships(member) == [list.ap_id]
end
end
diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs
index 23e89d685..84744e5af 100644
--- a/test/web/common_api/common_api_test.exs
+++ b/test/web/common_api/common_api_test.exs
@@ -114,13 +114,11 @@ defmodule Pleroma.Web.CommonAPITest do
user = insert(:user)
{:ok, list} = Pleroma.List.create("foo", user)
- list_ap_id = Pleroma.List.ap_id(user, list.id)
-
{:ok, activity} =
CommonAPI.post(user, %{"status" => "foobar", "visibility" => "list:#{list.id}"})
- assert activity.data["bcc"] == [list_ap_id]
- assert activity.recipients == [list_ap_id, user.ap_id]
+ assert activity.data["bcc"] == [list.ap_id]
+ assert activity.recipients == [list.ap_id, user.ap_id]
end
end