summaryrefslogtreecommitdiff
path: root/test/marker_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-09-17 13:26:04 +0200
committerlain <lain@soykaf.club>2020-09-17 13:26:04 +0200
commit7a7385092885bd3c28497828d7b8da12e769ca83 (patch)
treebeee4c47c210cf4019d44e4c0b9a659c62436fe2 /test/marker_test.exs
parentc4061f06ba26656a6a0e61f68c5f097930a4b054 (diff)
parentc5acbf8a1bd1a14ea82610cb3f69b8ebbb3ea28b (diff)
downloadpleroma-7a7385092885bd3c28497828d7b8da12e769ca83.tar.gz
pleroma-7a7385092885bd3c28497828d7b8da12e769ca83.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
Diffstat (limited to 'test/marker_test.exs')
-rw-r--r--test/marker_test.exs4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/marker_test.exs b/test/marker_test.exs
index 5b6d0b4a4..7b3943c7b 100644
--- a/test/marker_test.exs
+++ b/test/marker_test.exs
@@ -33,8 +33,8 @@ defmodule Pleroma.MarkerTest do
test "returns user markers" do
user = insert(:user)
marker = insert(:marker, user: user)
- insert(:notification, user: user)
- insert(:notification, user: user)
+ insert(:notification, user: user, activity: insert(:note_activity))
+ insert(:notification, user: user, activity: insert(:note_activity))
insert(:marker, timeline: "home", user: user)
assert Marker.get_markers(