diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-04-14 06:38:56 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-04-14 06:38:56 +0000 |
| commit | 60cc7d6c9a2ec60c3a98f0fe51d68d3dbd5d21c2 (patch) | |
| tree | f037060e2d82eb69c3eca0151ce78ca53c7962b9 /test/web/mastodon_api/controllers/marker_controller_test.exs | |
| parent | e3db1c471e2f52a5bbdc854b594fa08342edf181 (diff) | |
| parent | a16b3dbcbf19d584eaefbecbfb4ff34fa7b3743a (diff) | |
| download | pleroma-60cc7d6c9a2ec60c3a98f0fe51d68d3dbd5d21c2.tar.gz pleroma-60cc7d6c9a2ec60c3a98f0fe51d68d3dbd5d21c2.zip | |
Merge branch 'issue/1276' into 'develop'
[#1276] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
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 919f295bd..7280abd10 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 @@ -70,7 +72,8 @@ defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do "notifications" => %{ "last_read_id" => "69420", "updated_at" => _, - "version" => 0 + "version" => 0, + "pleroma" => %{"unread_count" => 0} } } = response end @@ -99,7 +102,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 |