summaryrefslogtreecommitdiff
path: root/test/web/streamer
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-10-30 17:51:15 -0500
committerMark Felder <feld@FreeBSD.org>2019-10-30 17:51:15 -0500
commitfcea6a9d2c7ae3223a6ec5038869a68ec618cb77 (patch)
treea2cb03d2c00acc2d63bb448613d7b40817d1d7c9 /test/web/streamer
parentae59b38203b5358ddbf7f2cc5e2cbc816d171452 (diff)
parent9b40e5f563cc3478bb1d619278b9c8e7d689f121 (diff)
downloadpleroma-fcea6a9d2c7ae3223a6ec5038869a68ec618cb77.tar.gz
pleroma-fcea6a9d2c7ae3223a6ec5038869a68ec618cb77.zip
Merge branch 'develop' into feature/fast_sanitize
Diffstat (limited to 'test/web/streamer')
-rw-r--r--test/web/streamer/streamer_test.exs9
1 files changed, 6 insertions, 3 deletions
diff --git a/test/web/streamer/streamer_test.exs b/test/web/streamer/streamer_test.exs
index 400f3287d..cb1015171 100644
--- a/test/web/streamer/streamer_test.exs
+++ b/test/web/streamer/streamer_test.exs
@@ -169,7 +169,8 @@ defmodule Pleroma.Web.StreamerTest do
test "it doesn't send to user if recipients invalid and thread containment is enabled" do
Pleroma.Config.put([:instance, :skip_thread_containment], false)
author = insert(:user)
- user = insert(:user, following: [author.ap_id])
+ user = insert(:user)
+ User.follow(user, author, "accept")
activity =
insert(:note_activity,
@@ -191,7 +192,8 @@ defmodule Pleroma.Web.StreamerTest do
test "it sends message if recipients invalid and thread containment is disabled" do
Pleroma.Config.put([:instance, :skip_thread_containment], true)
author = insert(:user)
- user = insert(:user, following: [author.ap_id])
+ user = insert(:user)
+ User.follow(user, author, "accept")
activity =
insert(:note_activity,
@@ -213,7 +215,8 @@ defmodule Pleroma.Web.StreamerTest do
test "it sends message if recipients invalid and thread containment is enabled but user's thread containment is disabled" do
Pleroma.Config.put([:instance, :skip_thread_containment], false)
author = insert(:user)
- user = insert(:user, following: [author.ap_id], skip_thread_containment: true)
+ user = insert(:user, skip_thread_containment: true)
+ User.follow(user, author, "accept")
activity =
insert(:note_activity,