summaryrefslogtreecommitdiff
path: root/test/marker_test.exs
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-09-22 13:37:02 -0500
committerAlex Gleason <alex@alexgleason.me>2020-09-22 13:37:02 -0500
commit3104367931bdd259752fb9e2b7a19ba42a72e614 (patch)
tree92d59fed02dded222d51e300269f8a742e4c9c05 /test/marker_test.exs
parentbf181ca96850f3e5baaf8f3dcd6e11b926fcdeeb (diff)
parent02f12ec6253093d8bedaf84d78d0f7e533745e1b (diff)
downloadpleroma-3104367931bdd259752fb9e2b7a19ba42a72e614.tar.gz
pleroma-3104367931bdd259752fb9e2b7a19ba42a72e614.zip
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
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(