diff options
author | Roman Chvanikov <chvanikoff@pm.me> | 2020-05-09 11:31:34 +0300 |
---|---|---|
committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-05-09 11:31:34 +0300 |
commit | 942093683a1e6b3f3d3692268b2af8390da6d325 (patch) | |
tree | 3ad22c9d4d06716f469925b7c15a30e9f0e25c57 /test/web/mastodon_api/controllers/marker_controller_test.exs | |
parent | cbe383ae832f13d5d2a20ee8fb5e85498205fbc3 (diff) | |
parent | c962c6afb3b30eb6d42c2a5548898b3713492169 (diff) | |
download | pleroma-942093683a1e6b3f3d3692268b2af8390da6d325.tar.gz pleroma-942093683a1e6b3f3d3692268b2af8390da6d325.zip |
Merge branch 'develop' into feature/admin-api-status-count-per-instance
Diffstat (limited to 'test/web/mastodon_api/controllers/marker_controller_test.exs')
-rw-r--r-- | test/web/mastodon_api/controllers/marker_controller_test.exs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/web/mastodon_api/controllers/marker_controller_test.exs b/test/web/mastodon_api/controllers/marker_controller_test.exs index bce719bea..6dd40fb4a 100644 --- a/test/web/mastodon_api/controllers/marker_controller_test.exs +++ b/test/web/mastodon_api/controllers/marker_controller_test.exs @@ -11,6 +11,7 @@ defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do test "gets markers with correct scopes", %{conn: conn} do user = insert(:user) token = insert(:oauth_token, user: user, scopes: ["read:statuses"]) + insert_list(7, :notification, user: user) {:ok, %{"notifications" => marker}} = Pleroma.Marker.upsert( @@ -29,7 +30,8 @@ defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do "notifications" => %{ "last_read_id" => "69420", "updated_at" => NaiveDateTime.to_iso8601(marker.updated_at), - "version" => 0 + "version" => 0, + "pleroma" => %{"unread_count" => 7} } } end @@ -71,7 +73,8 @@ defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do "notifications" => %{ "last_read_id" => "69420", "updated_at" => _, - "version" => 0 + "version" => 0, + "pleroma" => %{"unread_count" => 0} } } = response end @@ -101,7 +104,8 @@ defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do "notifications" => %{ "last_read_id" => "69888", "updated_at" => NaiveDateTime.to_iso8601(marker.updated_at), - "version" => 0 + "version" => 0, + "pleroma" => %{"unread_count" => 0} } } end |