summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/notification_controller_test.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-05-20 20:27:03 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-05-20 20:27:03 +0300
commit6fd4f58ead9189697ed004b6ca593d5ba746898f (patch)
tree447bf02a1bc76941686e2017b6b8bed4494737d4 /test/web/mastodon_api/controllers/notification_controller_test.exs
parent1871a5ddb4a803ebe4fae6943a9b9c94f1f9c1a8 (diff)
parent265746b21f5a58f49efbdbe9d9eecd697781b93b (diff)
downloadpleroma-6fd4f58ead9189697ed004b6ca593d5ba746898f.tar.gz
pleroma-6fd4f58ead9189697ed004b6ca593d5ba746898f.zip
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
Diffstat (limited to 'test/web/mastodon_api/controllers/notification_controller_test.exs')
-rw-r--r--test/web/mastodon_api/controllers/notification_controller_test.exs4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/web/mastodon_api/controllers/notification_controller_test.exs b/test/web/mastodon_api/controllers/notification_controller_test.exs
index d9356a844..562fc4d8e 100644
--- a/test/web/mastodon_api/controllers/notification_controller_test.exs
+++ b/test/web/mastodon_api/controllers/notification_controller_test.exs
@@ -12,9 +12,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationControllerTest do
import Pleroma.Factory
- test "does NOT render account/pleroma/relationship if this is disabled by default" do
- clear_config([:extensions, :output_relationships_in_statuses_by_default], false)
-
+ test "does NOT render account/pleroma/relationship by default" do
%{user: user, conn: conn} = oauth_access(["read:notifications"])
other_user = insert(:user)