summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/views
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-04-14 16:32:34 +0000
committerlain <lain@soykaf.club>2020-04-14 16:32:34 +0000
commitc02e6ceea567b3ae7a5492ebd4d0babb798a13b4 (patch)
treebdabe459c11fd9ef2f79402c6a454c3ca04fb341 /test/web/mastodon_api/views
parent3677a1e5785e8a753652debf37b2818e622f9ffd (diff)
parent4576520461e2e3a1c78133aaf31cb742a2a1a689 (diff)
downloadpleroma-c02e6ceea567b3ae7a5492ebd4d0babb798a13b4.tar.gz
pleroma-c02e6ceea567b3ae7a5492ebd4d0babb798a13b4.zip
Merge branch 'revert-60cc7d6c' into 'develop'
Revert "Merge branch 'issue/1276' into 'develop'" See merge request pleroma/pleroma!2384
Diffstat (limited to 'test/web/mastodon_api/views')
-rw-r--r--test/web/mastodon_api/views/marker_view_test.exs8
1 files changed, 3 insertions, 5 deletions
diff --git a/test/web/mastodon_api/views/marker_view_test.exs b/test/web/mastodon_api/views/marker_view_test.exs
index 48a0a6d33..893cf8857 100644
--- a/test/web/mastodon_api/views/marker_view_test.exs
+++ b/test/web/mastodon_api/views/marker_view_test.exs
@@ -8,21 +8,19 @@ defmodule Pleroma.Web.MastodonAPI.MarkerViewTest do
import Pleroma.Factory
test "returns markers" do
- marker1 = insert(:marker, timeline: "notifications", last_read_id: "17", unread_count: 5)
+ marker1 = insert(:marker, timeline: "notifications", last_read_id: "17")
marker2 = insert(:marker, timeline: "home", last_read_id: "42")
assert MarkerView.render("markers.json", %{markers: [marker1, marker2]}) == %{
"home" => %{
last_read_id: "42",
updated_at: NaiveDateTime.to_iso8601(marker2.updated_at),
- version: 0,
- pleroma: %{unread_count: 0}
+ version: 0
},
"notifications" => %{
last_read_id: "17",
updated_at: NaiveDateTime.to_iso8601(marker1.updated_at),
- version: 0,
- pleroma: %{unread_count: 5}
+ version: 0
}
}
end