diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-09-17 17:14:20 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-09-17 17:14:20 +0300 |
| commit | d9fb5bc08ad67b55d0cd25c1a0d7d3a740758427 (patch) | |
| tree | 6303695147d01ab5e71e556f2b8f7725536e475f /test/web/mastodon_api/controllers/marker_controller_test.exs | |
| parent | 7cdbd91d83c02a79c22783ca489ef82e82b31a51 (diff) | |
| parent | cd93aa2aed6fda516d4fc2aabb44c5e178a6543d (diff) | |
| download | pleroma-d9fb5bc08ad67b55d0cd25c1a0d7d3a740758427.tar.gz pleroma-d9fb5bc08ad67b55d0cd25c1a0d7d3a740758427.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
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( |