diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-10-08 15:44:48 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-10-08 15:44:48 -0500 |
| commit | 77b1ea68a7700ac4a78c7f2e0ea9f118441d23da (patch) | |
| tree | 06243af101a609256b517f48175380a7c4f5bfbb /test/web/mastodon_api/controllers/marker_controller_test.exs | |
| parent | 4af1b803811cbb59d41f0149706d6dda340b4755 (diff) | |
| parent | 74be4de3f6c2c34447029649526637411acfa9f3 (diff) | |
| download | pleroma-77b1ea68a7700ac4a78c7f2e0ea9f118441d23da.tar.gz pleroma-77b1ea68a7700ac4a78c7f2e0ea9f118441d23da.zip | |
Merge remote-tracking branch 'upstream/develop' into aliases
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( |