diff options
| author | lain <lain@soykaf.club> | 2020-09-17 13:26:04 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-17 13:26:04 +0200 |
| commit | 7a7385092885bd3c28497828d7b8da12e769ca83 (patch) | |
| tree | beee4c47c210cf4019d44e4c0b9a659c62436fe2 /test/web/mastodon_api/controllers/marker_controller_test.exs | |
| parent | c4061f06ba26656a6a0e61f68c5f097930a4b054 (diff) | |
| parent | c5acbf8a1bd1a14ea82610cb3f69b8ebbb3ea28b (diff) | |
| download | pleroma-7a7385092885bd3c28497828d7b8da12e769ca83.tar.gz pleroma-7a7385092885bd3c28497828d7b8da12e769ca83.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
Diffstat (limited to 'test/web/mastodon_api/controllers/marker_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/marker_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/mastodon_api/controllers/marker_controller_test.exs b/test/web/mastodon_api/controllers/marker_controller_test.exs index 6dd40fb4a..9f0481120 100644 --- a/test/web/mastodon_api/controllers/marker_controller_test.exs +++ b/test/web/mastodon_api/controllers/marker_controller_test.exs @@ -11,7 +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) + insert_list(7, :notification, user: user, activity: insert(:note_activity)) {:ok, %{"notifications" => marker}} = Pleroma.Marker.upsert( |