aboutsummaryrefslogtreecommitdiff
path: root/test/pleroma/web/admin_api
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2022-10-10 13:20:28 -0400
committerMark Felder <feld@feld.me>2022-10-10 13:20:28 -0400
commitb3a02c6b9f823798fb6e077cf36dcf123a3bad7e (patch)
tree315adc61df49588a6992e7c55021d13966b6240e /test/pleroma/web/admin_api
parent7ac4e858a019891ce5873936db1b4a0ec0566a97 (diff)
parent8042e0ebe1277519d446a7e2fbcf17629c1ffab2 (diff)
downloadpleroma-finch_everywhere.tar.gz
Merge branch 'develop' into finch_everywherefinch_everywhere
Diffstat (limited to 'test/pleroma/web/admin_api')
-rw-r--r--test/pleroma/web/admin_api/controllers/instance_document_controller_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/pleroma/web/admin_api/controllers/instance_document_controller_test.exs b/test/pleroma/web/admin_api/controllers/instance_document_controller_test.exs
index 2601a026f..9511dccea 100644
--- a/test/pleroma/web/admin_api/controllers/instance_document_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/instance_document_controller_test.exs
@@ -3,7 +3,7 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.InstanceDocumentControllerTest do
- use Pleroma.Web.ConnCase, async: true
+ use Pleroma.Web.ConnCase
import Pleroma.Factory
@dir "test/tmp/instance_static"