pleroma

commit: 151df9fc17ec01ab566c433571a263741ed1844f
parent: 47cd59342f0f82415b04e36e05741e0fcafdbdcc
Author: rinpatch <rinpatch@sdf.org>
Date:   Thu, 24 Sep 2020 09:50:39 +0000

Merge branch 'fix/test-fix' into 'develop'

Fix for test on mac

See merge request pleroma/pleroma!3027
Diffstat:
M
test/emoji_test.exs
2
+-
M
test/utils_test.exs
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/emoji_test.exs b/test/emoji_test.exs
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.EmojiTest do
-  use ExUnit.Case, async: true
+  use ExUnit.Case
   alias Pleroma.Emoji
 
   describe "is_unicode_emoji?/1" do
diff --git a/test/utils_test.exs b/test/utils_test.exs
@@ -8,7 +8,7 @@ defmodule Pleroma.UtilsTest do
   describe "tmp_dir/1" do
     test "returns unique temporary directory" do
       {:ok, path} = Pleroma.Utils.tmp_dir("emoji")
-      assert path =~ ~r/\/tmp\/emoji-(.*)-#{:os.getpid()}-(.*)/
+      assert path =~ ~r/\/emoji-(.*)-#{:os.getpid()}-(.*)/
       File.rm_rf(path)
     end
   end