logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: d43d02bf41a278c2cb8b7e1c314f6178ae510e12
parent 757a21554f58c37319a283f06322c7a653bd680e
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Tue, 27 Sep 2022 21:50:43 +0000

Merge branch 'from/upstream-develop/tusooa/fix-static-tests' into 'develop'

Make instance document controller test sync

Closes #2940

See merge request pleroma/pleroma!3757

Diffstat:

Mtest/pleroma/web/admin_api/controllers/instance_document_controller_test.exs2+-
1 file changed, 1 insertion(+), 1 deletion(-)

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 @@ -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"