hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Merge branch 'issue/1276' into 'develop'"

Browse source 
This reverts merge request !1877
This commit is contained in:
lain 2020-04-14 16:32:22 +00:00
commit 4576520461
11 changed files with 51 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/web/mastodon_api/views/marker_view_test.exs
View file

@ -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