projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into restrict-origin
[akkoma]
/
test
/
marker_test.exs
diff --git
a/test/marker_test.exs
b/test/marker_test.exs
index 54c7106915eb4a4eb0888ea9bb4599384e116f7f..7b3943c7be5ca907b3c990daa46c72abc7d2a104 100644
(file)
--- a/
test/marker_test.exs
+++ b/
test/marker_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.MarkerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.MarkerTest do
@@
-33,8
+33,8
@@
defmodule Pleroma.MarkerTest do
test "returns user markers" do
user = insert(:user)
marker = insert(:marker, user: user)
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(
insert(:marker, timeline: "home", user: user)
assert Marker.get_markers(