Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reorganize test group to have shared a shared setup

Browse Source
This commit is contained in:
Mark Felder 2024-07-20 14:17:35 -04:00
parent 62280a3b9f
commit 3f5c9f003b
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/pleroma/web/common_api_test.exs
View File

@ -1923,12 +1923,12 @@ defmodule Pleroma.Web.CommonAPITest do
end end
describe "Oban jobs are cancelled" do describe "Oban jobs are cancelled" do
setup do: clear_config([:instance, :federating], true) setup do
clear_config([:instance, :federating], true)
test "when deleting posts" do local_user = insert(:user)
user = insert(:user)
follower_one = remote_one =
insert(:user, %{ insert(:user, %{
local: false, local: false,
nickname: "nick1@domain.com", nickname: "nick1@domain.com",
@ -1937,7 +1937,7 @@ defmodule Pleroma.Web.CommonAPITest do
shared_inbox: "https://domain.com/inbox" shared_inbox: "https://domain.com/inbox"
}) })
follower_two = remote_two =
insert(:user, %{ insert(:user, %{
local: false, local: false,
nickname: "nick2@example.com", nickname: "nick2@example.com",
@ -1946,11 +1946,19 @@ defmodule Pleroma.Web.CommonAPITest do
shared_inbox: "https://example.com/inbox" shared_inbox: "https://example.com/inbox"
}) })
{:ok, _, _} = Pleroma.User.follow(follower_one, user) %{local_user: local_user, remote_one: remote_one, remote_two: remote_two}
{:ok, _, _} = Pleroma.User.follow(follower_two, user) end
test "when deleting posts", %{
local_user: local_user,
remote_one: remote_one,
remote_two: remote_two
} do
{:ok, _, _} = Pleroma.User.follow(remote_one, local_user)
{:ok, _, _} = Pleroma.User.follow(remote_two, local_user)
{:ok, %{data: %{"id" => ap_id}} = activity} = {:ok, %{data: %{"id" => ap_id}} = activity} =
CommonAPI.post(user, %{status: "Happy Friday everyone!"}) CommonAPI.post(local_user, %{status: "Happy Friday everyone!"})
# Generate the publish_one jobs # Generate the publish_one jobs
ObanHelpers.perform_all() ObanHelpers.perform_all()
@ -1972,7 +1980,7 @@ defmodule Pleroma.Web.CommonAPITest do
assert length(publish_one_jobs) == 2 assert length(publish_one_jobs) == 2
# The delete should have triggered cancelling the publish_one jobs # The delete should have triggered cancelling the publish_one jobs
assert {:ok, _delete} = CommonAPI.delete(activity.id, user) assert {:ok, _delete} = CommonAPI.delete(activity.id, local_user)
# all_enqueued/1 will not return cancelled jobs # all_enqueued/1 will not return cancelled jobs
cancelled_jobs = cancelled_jobs =