From f4fe4fcbcc6332ddf43125dedc1902002b013b91 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 3 Aug 2023 23:00:30 +0100 Subject: [PATCH] More static stuff --- test/pleroma/emoji/pack_test.exs | 6 ++++-- test/pleroma/web/activity_pub/transmogrifier_test.exs | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/pleroma/emoji/pack_test.exs b/test/pleroma/emoji/pack_test.exs index 10685a421..2e0575831 100644 --- a/test/pleroma/emoji/pack_test.exs +++ b/test/pleroma/emoji/pack_test.exs @@ -3,9 +3,10 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Emoji.PackTest do - use Pleroma.DataCase + use Pleroma.DataCase, async: false alias Pleroma.Emoji.Pack + @static_dir Pleroma.Config.get!([:instance, :static_dir]) @emoji_path Path.join( Pleroma.Config.get!([:instance, :static_dir]), "emoji" @@ -14,6 +15,7 @@ defmodule Pleroma.Emoji.PackTest do setup do pack_path = Path.join(@emoji_path, "dump_pack") File.mkdir_p!(pack_path) + clear_config([:instance, :static_dir], @static_dir) File.write!(Path.join(pack_path, "pack.json"), """ { @@ -34,7 +36,7 @@ defmodule Pleroma.Emoji.PackTest do end describe "add_file/4" do - test "add emojies from zip file", %{pack: pack} do + test "add emojis from zip file", %{pack: pack} do file = %Plug.Upload{ content_type: "application/zip", filename: "emojis.zip", diff --git a/test/pleroma/web/activity_pub/transmogrifier_test.exs b/test/pleroma/web/activity_pub/transmogrifier_test.exs index 21494c16e..62472231b 100644 --- a/test/pleroma/web/activity_pub/transmogrifier_test.exs +++ b/test/pleroma/web/activity_pub/transmogrifier_test.exs @@ -25,6 +25,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do end setup do: clear_config([:instance, :max_remote_account_fields]) + setup do: clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local) describe "handle_incoming" do test "it works for incoming unfollows with an existing follow" do