diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-05-18 11:56:27 +0300 | 
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-05-18 11:56:27 +0300 | 
| commit | 01bd6a1e54c8734e8965f153a9406cecc07950f3 (patch) | |
| tree | 791348626f54b390167693da8c1a6481c54d78de /test/web/mastodon_api/controllers/notification_controller_test.exs | |
| parent | 8a383707ae143ba47fa1ba68da20bc6bec425126 (diff) | |
| parent | 1199cf3a788334cd3fdb968d9f736e43c1401da1 (diff) | |
| download | pleroma-01bd6a1e54c8734e8965f153a9406cecc07950f3.tar.gz pleroma-01bd6a1e54c8734e8965f153a9406cecc07950f3.zip  | |
Merge branch 'develop' into feature/admin-api-status-count-per-instance
Diffstat (limited to 'test/web/mastodon_api/controllers/notification_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/notification_controller_test.exs | 4 | 
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)  | 
