update tests
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
This commit is contained in:
parent
490cd33bc9
commit
0592f111f6
12 changed files with 30 additions and 26 deletions
|
|
@ -363,7 +363,7 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
|
||||||
test "accepts the 'list' stream", %{token: token, user: user} do
|
test "accepts the 'list' stream", %{token: token, user: user} do
|
||||||
posting_user = insert(:user)
|
posting_user = insert(:user)
|
||||||
|
|
||||||
{:ok, list} = Pleroma.List.create("test", user)
|
{:ok, list} = Pleroma.List.create(%{title: "test"}, user)
|
||||||
Pleroma.List.follow(list, posting_user)
|
Pleroma.List.follow(list, posting_user)
|
||||||
|
|
||||||
assert {:ok, _} = start_socket("?stream=list&access_token=#{token.token}&list=#{list.id}")
|
assert {:ok, _} = start_socket("?stream=list&access_token=#{token.token}&list=#{list.id}")
|
||||||
|
|
|
||||||
|
|
@ -1754,7 +1754,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
|
||||||
test "fetch_activities/2 returns activities addressed to a list " do
|
test "fetch_activities/2 returns activities addressed to a list " do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
member = insert(:user)
|
member = insert(:user)
|
||||||
{:ok, list} = Pleroma.List.create("foo", user)
|
{:ok, list} = Pleroma.List.create(%{title: "foo"}, user)
|
||||||
{:ok, list} = Pleroma.List.follow(list, member)
|
{:ok, list} = Pleroma.List.follow(list, member)
|
||||||
|
|
||||||
{:ok, activity} = CommonAPI.post(user, %{status: "foobar", visibility: "list:#{list.id}"})
|
{:ok, activity} = CommonAPI.post(user, %{status: "foobar", visibility: "list:#{list.id}"})
|
||||||
|
|
|
||||||
|
|
@ -334,7 +334,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
|
||||||
|
|
||||||
test "activity with BCC is published to a list member." do
|
test "activity with BCC is published to a list member." do
|
||||||
actor = insert(:user)
|
actor = insert(:user)
|
||||||
{:ok, list} = Pleroma.List.create("list", actor)
|
{:ok, list} = Pleroma.List.create(%{title: "list"}, actor)
|
||||||
list_member = insert(:user, %{local: false})
|
list_member = insert(:user, %{local: false})
|
||||||
|
|
||||||
Pleroma.List.follow(list, list_member)
|
Pleroma.List.follow(list, list_member)
|
||||||
|
|
|
||||||
|
|
@ -581,7 +581,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
|
||||||
|
|
||||||
test "it strips BCC field" do
|
test "it strips BCC field" do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
{:ok, list} = Pleroma.List.create("foo", user)
|
{:ok, list} = Pleroma.List.create(%{title: "foo"}, user)
|
||||||
|
|
||||||
{:ok, activity} = CommonAPI.post(user, %{status: "foobar", visibility: "list:#{list.id}"})
|
{:ok, activity} = CommonAPI.post(user, %{status: "foobar", visibility: "list:#{list.id}"})
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ defmodule Pleroma.Web.ActivityPub.VisibilityTest do
|
||||||
following = insert(:user)
|
following = insert(:user)
|
||||||
unrelated = insert(:user)
|
unrelated = insert(:user)
|
||||||
{:ok, following, user} = Pleroma.User.follow(following, user)
|
{:ok, following, user} = Pleroma.User.follow(following, user)
|
||||||
{:ok, list} = Pleroma.List.create("foo", user)
|
{:ok, list} = Pleroma.List.create(%{title: "foo"}, user)
|
||||||
|
|
||||||
Pleroma.List.follow(list, unrelated)
|
Pleroma.List.follow(list, unrelated)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -647,7 +647,7 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do
|
||||||
describe "maybe_add_list_data/3" do
|
describe "maybe_add_list_data/3" do
|
||||||
test "adds list params when found user list" do
|
test "adds list params when found user list" do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
{:ok, %Pleroma.List{} = list} = Pleroma.List.create("title", user)
|
{:ok, %Pleroma.List{} = list} = Pleroma.List.create(%{title: "title"}, user)
|
||||||
|
|
||||||
assert Utils.maybe_add_list_data(%{additional: %{}, object: %{}}, user, {:list, list.id}) ==
|
assert Utils.maybe_add_list_data(%{additional: %{}, object: %{}}, user, {:list, list.id}) ==
|
||||||
%{
|
%{
|
||||||
|
|
@ -658,7 +658,7 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do
|
||||||
|
|
||||||
test "returns original params when list not found" do
|
test "returns original params when list not found" do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
{:ok, %Pleroma.List{} = list} = Pleroma.List.create("title", insert(:user))
|
{:ok, %Pleroma.List{} = list} = Pleroma.List.create(%{title: "title"}, insert(:user))
|
||||||
|
|
||||||
assert Utils.maybe_add_list_data(%{additional: %{}, object: %{}}, user, {:list, list.id}) ==
|
assert Utils.maybe_add_list_data(%{additional: %{}, object: %{}}, user, {:list, list.id}) ==
|
||||||
%{additional: %{}, object: %{}}
|
%{additional: %{}, object: %{}}
|
||||||
|
|
|
||||||
|
|
@ -759,7 +759,7 @@ defmodule Pleroma.Web.CommonAPITest do
|
||||||
|
|
||||||
test "it allows to address a list" do
|
test "it allows to address a list" do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
{:ok, list} = Pleroma.List.create("foo", user)
|
{:ok, list} = Pleroma.List.create(%{title: "foo"}, user)
|
||||||
|
|
||||||
{:ok, activity} = CommonAPI.post(user, %{status: "foobar", visibility: "list:#{list.id}"})
|
{:ok, activity} = CommonAPI.post(user, %{status: "foobar", visibility: "list:#{list.id}"})
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1815,7 +1815,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
|
||||||
test "returns lists to which the account belongs" do
|
test "returns lists to which the account belongs" do
|
||||||
%{user: user, conn: conn} = oauth_access(["read:lists"])
|
%{user: user, conn: conn} = oauth_access(["read:lists"])
|
||||||
other_user = insert(:user)
|
other_user = insert(:user)
|
||||||
assert {:ok, %Pleroma.List{id: _list_id} = list} = Pleroma.List.create("Test List", user)
|
assert {:ok, %Pleroma.List{id: _list_id} = list} = Pleroma.List.create(%{title: "Test List"}, user)
|
||||||
{:ok, %{following: _following}} = Pleroma.List.follow(list, other_user)
|
{:ok, %{following: _following}} = Pleroma.List.follow(list, other_user)
|
||||||
|
|
||||||
assert [%{"id" => _list_id, "title" => "Test List"}] =
|
assert [%{"id" => _list_id, "title" => "Test List"}] =
|
||||||
|
|
|
||||||
|
|
@ -631,7 +631,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
|
||||||
{:ok, activity_two} = CommonAPI.post(other_user, %{status: "Marisa is stupid."})
|
{:ok, activity_two} = CommonAPI.post(other_user, %{status: "Marisa is stupid."})
|
||||||
{:ok, _} = CommonAPI.repeat(activity_one.id, other_user)
|
{:ok, _} = CommonAPI.repeat(activity_one.id, other_user)
|
||||||
|
|
||||||
{:ok, list} = Pleroma.List.create("name", user)
|
{:ok, list} = Pleroma.List.create(%{title: "name"}, user)
|
||||||
{:ok, list} = Pleroma.List.follow(list, other_user)
|
{:ok, list} = Pleroma.List.follow(list, other_user)
|
||||||
|
|
||||||
conn = get(conn, "/api/v1/timelines/list/#{list.id}")
|
conn = get(conn, "/api/v1/timelines/list/#{list.id}")
|
||||||
|
|
@ -643,7 +643,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
|
||||||
|
|
||||||
test "works with pagination", %{user: user, conn: conn} do
|
test "works with pagination", %{user: user, conn: conn} do
|
||||||
other_user = insert(:user)
|
other_user = insert(:user)
|
||||||
{:ok, list} = Pleroma.List.create("name", user)
|
{:ok, list} = Pleroma.List.create(%{title: "name"}, user)
|
||||||
{:ok, list} = Pleroma.List.follow(list, other_user)
|
{:ok, list} = Pleroma.List.follow(list, other_user)
|
||||||
|
|
||||||
Enum.each(1..30, fn i ->
|
Enum.each(1..30, fn i ->
|
||||||
|
|
@ -669,7 +669,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
|
||||||
other_user = insert(:user)
|
other_user = insert(:user)
|
||||||
{:ok, _activity_one} = CommonAPI.post(user, %{status: "Marisa is cute."})
|
{:ok, _activity_one} = CommonAPI.post(user, %{status: "Marisa is cute."})
|
||||||
{:ok, activity_two} = CommonAPI.post(other_user, %{status: "Marisa is cute."})
|
{:ok, activity_two} = CommonAPI.post(other_user, %{status: "Marisa is cute."})
|
||||||
{:ok, list} = Pleroma.List.create("name", user)
|
{:ok, list} = Pleroma.List.create(%{title: "name"}, user)
|
||||||
{:ok, list} = Pleroma.List.follow(list, other_user)
|
{:ok, list} = Pleroma.List.follow(list, other_user)
|
||||||
|
|
||||||
conn = get(conn, "/api/v1/timelines/list/#{list.id}")
|
conn = get(conn, "/api/v1/timelines/list/#{list.id}")
|
||||||
|
|
@ -692,7 +692,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
|
||||||
visibility: "private"
|
visibility: "private"
|
||||||
})
|
})
|
||||||
|
|
||||||
{:ok, list} = Pleroma.List.create("name", user)
|
{:ok, list} = Pleroma.List.create(%{title: "name"}, user)
|
||||||
{:ok, list} = Pleroma.List.follow(list, other_user)
|
{:ok, list} = Pleroma.List.follow(list, other_user)
|
||||||
|
|
||||||
conn = get(conn, "/api/v1/timelines/list/#{list.id}")
|
conn = get(conn, "/api/v1/timelines/list/#{list.id}")
|
||||||
|
|
@ -710,7 +710,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
|
||||||
{:ok, _} = CommonAPI.react_with_emoji(activity.id, user3, "🎅")
|
{:ok, _} = CommonAPI.react_with_emoji(activity.id, user3, "🎅")
|
||||||
User.mute(user, user3)
|
User.mute(user, user3)
|
||||||
|
|
||||||
{:ok, list} = Pleroma.List.create("name", user)
|
{:ok, list} = Pleroma.List.create(%{title: "name"}, user)
|
||||||
{:ok, list} = Pleroma.List.follow(list, user2)
|
{:ok, list} = Pleroma.List.follow(list, user2)
|
||||||
|
|
||||||
result =
|
result =
|
||||||
|
|
@ -741,7 +741,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
|
||||||
end
|
end
|
||||||
|
|
||||||
test "filtering", %{user: user, conn: conn} do
|
test "filtering", %{user: user, conn: conn} do
|
||||||
{:ok, list} = Pleroma.List.create("name", user)
|
{:ok, list} = Pleroma.List.create(%{title: "name"}, user)
|
||||||
|
|
||||||
local_user = insert(:user)
|
local_user = insert(:user)
|
||||||
{:ok, local_activity} = CommonAPI.post(local_user, %{status: "Marisa is stupid."})
|
{:ok, local_activity} = CommonAPI.post(local_user, %{status: "Marisa is stupid."})
|
||||||
|
|
|
||||||
|
|
@ -10,11 +10,12 @@ defmodule Pleroma.Web.MastodonAPI.ListViewTest do
|
||||||
test "show" do
|
test "show" do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
title = "mortal enemies"
|
title = "mortal enemies"
|
||||||
{:ok, list} = Pleroma.List.create(title, user)
|
{:ok, list} = Pleroma.List.create(%{title: title}, user)
|
||||||
|
|
||||||
expected = %{
|
expected = %{
|
||||||
id: to_string(list.id),
|
id: to_string(list.id),
|
||||||
title: title
|
title: title,
|
||||||
|
exclusive: false
|
||||||
}
|
}
|
||||||
|
|
||||||
assert expected == ListView.render("show.json", %{list: list})
|
assert expected == ListView.render("show.json", %{list: list})
|
||||||
|
|
@ -23,10 +24,13 @@ defmodule Pleroma.Web.MastodonAPI.ListViewTest do
|
||||||
test "index" do
|
test "index" do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
|
|
||||||
{:ok, list} = Pleroma.List.create("my list", user)
|
{:ok, list} = Pleroma.List.create(%{title: "my list", exclusive: false}, user)
|
||||||
{:ok, list2} = Pleroma.List.create("cofe", user)
|
{:ok, list2} = Pleroma.List.create(%{title: "cofe", exclusive: true}, user)
|
||||||
|
|
||||||
assert [%{id: _, title: "my list"}, %{id: _, title: "cofe"}] =
|
assert [
|
||||||
|
%{id: _, title: "my list", exclusive: false},
|
||||||
|
%{id: _, title: "cofe", exclusive: true}
|
||||||
|
] =
|
||||||
ListView.render("index.json", lists: [list, list2])
|
ListView.render("index.json", lists: [list, list2])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -909,7 +909,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
|
||||||
test "visibility/list" do
|
test "visibility/list" do
|
||||||
user = insert(:user)
|
user = insert(:user)
|
||||||
|
|
||||||
{:ok, list} = Pleroma.List.create("foo", user)
|
{:ok, list} = Pleroma.List.create(%{title: "foo"}, user)
|
||||||
|
|
||||||
{:ok, activity} = CommonAPI.post(user, %{status: "foobar", visibility: "list:#{list.id}"})
|
{:ok, activity} = CommonAPI.post(user, %{status: "foobar", visibility: "list:#{list.id}"})
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -220,7 +220,7 @@ defmodule Pleroma.Web.StreamerTest do
|
||||||
} do
|
} do
|
||||||
%{token: read_lists_token} = oauth_access(["read:lists"], user: user)
|
%{token: read_lists_token} = oauth_access(["read:lists"], user: user)
|
||||||
%{token: invalid_token} = oauth_access(["irrelevant:scope"], user: user)
|
%{token: invalid_token} = oauth_access(["irrelevant:scope"], user: user)
|
||||||
{:ok, list} = List.create("Test", user)
|
{:ok, list} = List.create(%{title: "Test"}, user)
|
||||||
|
|
||||||
assert {:error, _} = Streamer.get_topic("list:#{list.id}", user, read_oauth_token)
|
assert {:error, _} = Streamer.get_topic("list:#{list.id}", user, read_oauth_token)
|
||||||
|
|
||||||
|
|
@ -233,7 +233,7 @@ defmodule Pleroma.Web.StreamerTest do
|
||||||
|
|
||||||
test "disallows list stream that are not owned by the user", %{user: user, token: oauth_token} do
|
test "disallows list stream that are not owned by the user", %{user: user, token: oauth_token} do
|
||||||
another_user = insert(:user)
|
another_user = insert(:user)
|
||||||
{:ok, list} = List.create("Test", another_user)
|
{:ok, list} = List.create(%{title: "Test"}, another_user)
|
||||||
|
|
||||||
assert {:error, _} = Streamer.get_topic("list:#{list.id}", user, oauth_token)
|
assert {:error, _} = Streamer.get_topic("list:#{list.id}", user, oauth_token)
|
||||||
assert {:error, _} = Streamer.get_topic("list", user, oauth_token, %{"list" => list.id})
|
assert {:error, _} = Streamer.get_topic("list", user, oauth_token, %{"list" => list.id})
|
||||||
|
|
@ -803,7 +803,7 @@ defmodule Pleroma.Web.StreamerTest do
|
||||||
|
|
||||||
{:ok, user_a, user_b} = User.follow(user_a, user_b)
|
{:ok, user_a, user_b} = User.follow(user_a, user_b)
|
||||||
|
|
||||||
{:ok, list} = List.create("Test", user_a)
|
{:ok, list} = List.create(%{title: "Test"}, user_a)
|
||||||
{:ok, list} = List.follow(list, user_b)
|
{:ok, list} = List.follow(list, user_b)
|
||||||
|
|
||||||
Streamer.get_topic_and_add_socket("list", user_a, user_a_token, %{"list" => list.id})
|
Streamer.get_topic_and_add_socket("list", user_a, user_a_token, %{"list" => list.id})
|
||||||
|
|
@ -820,7 +820,7 @@ defmodule Pleroma.Web.StreamerTest do
|
||||||
test "it doesn't send unwanted private posts to list", %{user: user_a, token: user_a_token} do
|
test "it doesn't send unwanted private posts to list", %{user: user_a, token: user_a_token} do
|
||||||
user_b = insert(:user)
|
user_b = insert(:user)
|
||||||
|
|
||||||
{:ok, list} = List.create("Test", user_a)
|
{:ok, list} = List.create(%{title: "Test"}, user_a)
|
||||||
{:ok, list} = List.follow(list, user_b)
|
{:ok, list} = List.follow(list, user_b)
|
||||||
|
|
||||||
Streamer.get_topic_and_add_socket("list", user_a, user_a_token, %{"list" => list.id})
|
Streamer.get_topic_and_add_socket("list", user_a, user_a_token, %{"list" => list.id})
|
||||||
|
|
@ -839,7 +839,7 @@ defmodule Pleroma.Web.StreamerTest do
|
||||||
|
|
||||||
{:ok, user_a, user_b} = User.follow(user_a, user_b)
|
{:ok, user_a, user_b} = User.follow(user_a, user_b)
|
||||||
|
|
||||||
{:ok, list} = List.create("Test", user_a)
|
{:ok, list} = List.create(%{title: "Test"}, user_a)
|
||||||
{:ok, list} = List.follow(list, user_b)
|
{:ok, list} = List.follow(list, user_b)
|
||||||
|
|
||||||
Streamer.get_topic_and_add_socket("list", user_a, user_a_token, %{"list" => list.id})
|
Streamer.get_topic_and_add_socket("list", user_a, user_a_token, %{"list" => list.id})
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue