diff options
| author | lain <lain@soykaf.club> | 2020-04-14 16:32:34 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-14 16:32:34 +0000 |
| commit | c02e6ceea567b3ae7a5492ebd4d0babb798a13b4 (patch) | |
| tree | bdabe459c11fd9ef2f79402c6a454c3ca04fb341 /test/web/mastodon_api/controllers/marker_controller_test.exs | |
| parent | 3677a1e5785e8a753652debf37b2818e622f9ffd (diff) | |
| parent | 4576520461e2e3a1c78133aaf31cb742a2a1a689 (diff) | |
| download | pleroma-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/controllers/marker_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/marker_controller_test.exs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/test/web/mastodon_api/controllers/marker_controller_test.exs b/test/web/mastodon_api/controllers/marker_controller_test.exs index 7280abd10..919f295bd 100644 --- a/test/web/mastodon_api/controllers/marker_controller_test.exs +++ b/test/web/mastodon_api/controllers/marker_controller_test.exs @@ -11,7 +11,6 @@ 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( @@ -30,8 +29,7 @@ defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do "notifications" => %{ "last_read_id" => "69420", "updated_at" => NaiveDateTime.to_iso8601(marker.updated_at), - "version" => 0, - "pleroma" => %{"unread_count" => 7} + "version" => 0 } } end @@ -72,8 +70,7 @@ defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do "notifications" => %{ "last_read_id" => "69420", "updated_at" => _, - "version" => 0, - "pleroma" => %{"unread_count" => 0} + "version" => 0 } } = response end @@ -102,8 +99,7 @@ defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do "notifications" => %{ "last_read_id" => "69888", "updated_at" => NaiveDateTime.to_iso8601(marker.updated_at), - "version" => 0, - "pleroma" => %{"unread_count" => 0} + "version" => 0 } } end |