summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/marker_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-09-17 14:09:01 +0000
committerlain <lain@soykaf.club>2020-09-17 14:09:01 +0000
commit7c60789ba540b8346c1a642b49c29df213217655 (patch)
tree9df5bb75df8f1344768ebe4d26a14d1043820667 /test/web/mastodon_api/controllers/marker_controller_test.exs
parentf58262c673616661baf9750c216a07d239ae99c3 (diff)
parent5426eb59976044f88247486da86a91b8f9eb35b5 (diff)
downloadpleroma-7c60789ba540b8346c1a642b49c29df213217655.tar.gz
pleroma-7c60789ba540b8346c1a642b49c29df213217655.zip
Merge branch 'develop' into 'nondiscoverable-user-metadata'
# Conflicts: # CHANGELOG.md
Diffstat (limited to 'test/web/mastodon_api/controllers/marker_controller_test.exs')
-rw-r--r--test/web/mastodon_api/controllers/marker_controller_test.exs2
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(