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 'remotes/origin/develop' into 2168-media-preview-proxy
[akkoma]
/
test
/
web
/
mastodon_api
/
views
/
marker_view_test.exs
diff --git
a/test/web/mastodon_api/views/marker_view_test.exs
b/test/web/mastodon_api/views/marker_view_test.exs
index 3ce794617f275f23c49925a5f6ef18421c053b69..48a0a6d331d3beedadeb0719dfeb1f056014ce66 100644
(file)
--- a/
test/web/mastodon_api/views/marker_view_test.exs
+++ b/
test/web/mastodon_api/views/marker_view_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.Web.MastodonAPI.MarkerViewTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MarkerViewTest do
@@
-14,15
+14,15
@@
defmodule Pleroma.Web.MastodonAPI.MarkerViewTest do
assert MarkerView.render("markers.json", %{markers: [marker1, marker2]}) == %{
"home" => %{
last_read_id: "42",
assert MarkerView.render("markers.json", %{markers: [marker1, marker2]}) == %{
"home" => %{
last_read_id: "42",
- unread_count: 0,
updated_at: NaiveDateTime.to_iso8601(marker2.updated_at),
updated_at: NaiveDateTime.to_iso8601(marker2.updated_at),
- version: 0
+ version: 0,
+ pleroma: %{unread_count: 0}
},
"notifications" => %{
last_read_id: "17",
},
"notifications" => %{
last_read_id: "17",
- unread_count: 5,
updated_at: NaiveDateTime.to_iso8601(marker1.updated_at),
updated_at: NaiveDateTime.to_iso8601(marker1.updated_at),
- version: 0
+ version: 0,
+ pleroma: %{unread_count: 5}
}
}
end
}
}
end