Merge branch 'develop' into feature/compat/push-subscriptions

# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock

1 files changed, 20 insertions, 0 deletions

diff --git a/test/list_test.exs b/test/list_test.exs
index da3b88024..19eef8f6b 100644
--- a/test/list_test.exs
+++ b/test/list_test.exs
@@ -90,4 +90,24 @@ defmodule Pleroma.ListTest do
     assert list_two in lists
     refute list_three in lists
   end
+
+  test "getting own lists a given user belongs to" do
+    owner = insert(:user)
+    not_owner = insert(:user)
+    member_1 = insert(:user)
+    member_2 = insert(:user)
+    {:ok, owned_list} = Pleroma.List.create("owned", owner)
+    {:ok, not_owned_list} = Pleroma.List.create("not owned", not_owner)
+    {:ok, owned_list} = Pleroma.List.follow(owned_list, member_1)
+    {:ok, owned_list} = Pleroma.List.follow(owned_list, member_2)
+    {:ok, not_owned_list} = Pleroma.List.follow(not_owned_list, member_1)
+    {:ok, not_owned_list} = Pleroma.List.follow(not_owned_list, member_2)
+
+    lists_1 = Pleroma.List.get_lists_account_belongs(owner, member_1.id)
+    assert owned_list in lists_1
+    refute not_owned_list in lists_1
+    lists_2 = Pleroma.List.get_lists_account_belongs(owner, member_2.id)
+    assert owned_list in lists_2
+    refute not_owned_list in lists_2
+  end
 end