summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/account_controller_test.exs
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-09-22 13:37:02 -0500
committerAlex Gleason <alex@alexgleason.me>2020-09-22 13:37:02 -0500
commit3104367931bdd259752fb9e2b7a19ba42a72e614 (patch)
tree92d59fed02dded222d51e300269f8a742e4c9c05 /test/web/mastodon_api/controllers/account_controller_test.exs
parentbf181ca96850f3e5baaf8f3dcd6e11b926fcdeeb (diff)
parent02f12ec6253093d8bedaf84d78d0f7e533745e1b (diff)
downloadpleroma-3104367931bdd259752fb9e2b7a19ba42a72e614.tar.gz
pleroma-3104367931bdd259752fb9e2b7a19ba42a72e614.zip
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
Diffstat (limited to 'test/web/mastodon_api/controllers/account_controller_test.exs')
-rw-r--r--test/web/mastodon_api/controllers/account_controller_test.exs5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/web/mastodon_api/controllers/account_controller_test.exs b/test/web/mastodon_api/controllers/account_controller_test.exs
index 17a1e7d66..f7f1369e4 100644
--- a/test/web/mastodon_api/controllers/account_controller_test.exs
+++ b/test/web/mastodon_api/controllers/account_controller_test.exs
@@ -1442,7 +1442,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
describe "verify_credentials" do
test "verify_credentials" do
%{user: user, conn: conn} = oauth_access(["read:accounts"])
- [notification | _] = insert_list(7, :notification, user: user)
+
+ [notification | _] =
+ insert_list(7, :notification, user: user, activity: insert(:note_activity))
+
Pleroma.Notification.set_read_up_to(user, notification.id)
conn = get(conn, "/api/v1/accounts/verify_credentials")