diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-09-23 11:56:22 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-09-23 11:56:22 -0500 |
| commit | f3a1f9c3bbb7321876a09b3846b5e10ecf4af94f (patch) | |
| tree | bcfd29188a841470cdeca478b1c5a3bbd4cc930a /test/web/mastodon_api/controllers/marker_controller_test.exs | |
| parent | 34d7e864db8f9cc7fb73ce2fef8466ce8e09ed85 (diff) | |
| parent | e02101e15c425416975f756aca7f3b058006668d (diff) | |
| download | pleroma-f3a1f9c3bbb7321876a09b3846b5e10ecf4af94f.tar.gz pleroma-f3a1f9c3bbb7321876a09b3846b5e10ecf4af94f.zip | |
Merge branch 'develop' into feature/bulk-confirmation
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( |