diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-09-17 08:41:35 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-09-17 08:41:35 +0300 |
| commit | b867f9d7aebc4e5b8832228a54f928b9f92dad0e (patch) | |
| tree | ee00341390c7e3382092a8f4191485f15067f943 /test/web/mastodon_api/controllers/marker_controller_test.exs | |
| parent | 917d325972e3aeb367583c61aaa109d62fcba837 (diff) | |
| parent | c5acbf8a1bd1a14ea82610cb3f69b8ebbb3ea28b (diff) | |
| download | pleroma-b867f9d7aebc4e5b8832228a54f928b9f92dad0e.tar.gz pleroma-b867f9d7aebc4e5b8832228a54f928b9f92dad0e.zip | |
Merge branch 'develop' into issue/2099
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( |