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 5d03db48ef1c7b42ec83ee08d8f2df37419012e5..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
@@
-15,7
+15,7
@@
defmodule Pleroma.MarkerTest do
assert %Ecto.Multi{
operations: [marker: {:run, _}, counters: {:run, _}]
} =
assert %Ecto.Multi{
operations: [marker: {:run, _}, counters: {:run, _}]
} =
- Marker.multi_set_
unread_count
(
+ Marker.multi_set_
last_read_id
(
Ecto.Multi.new(),
user,
"notifications"
Ecto.Multi.new(),
user,
"notifications"
@@
-25,7
+25,7
@@
defmodule Pleroma.MarkerTest do
test "return empty multi" do
user = insert(:user)
multi = Ecto.Multi.new()
test "return empty multi" do
user = insert(:user)
multi = Ecto.Multi.new()
- assert Marker.multi_set_
unread_count
(multi, user, "home") == multi
+ assert Marker.multi_set_
last_read_id
(multi, user, "home") == multi
end
end
end
end
@@
-33,8
+33,14
@@
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, activity: insert(:note_activity))
+ insert(:notification, user: user, activity: insert(:note_activity))
insert(:marker, timeline: "home", user: user)
insert(:marker, timeline: "home", user: user)
- assert Marker.get_markers(user, ["notifications"]) == [refresh_record(marker)]
+
+ assert Marker.get_markers(
+ user,
+ ["notifications"]
+ ) == [%Marker{refresh_record(marker) | unread_count: 2}]
end
end
end
end