summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-09-24 09:50:39 +0000
committerrinpatch <rinpatch@sdf.org>2020-09-24 09:50:39 +0000
commit151df9fc17ec01ab566c433571a263741ed1844f (patch)
treeb41866ddf065cdd9ef99f80a0ff3eb9d2407db23
parent47cd59342f0f82415b04e36e05741e0fcafdbdcc (diff)
parent165961f56dfa20d27869f53777798a8d4ce572f9 (diff)
Merge branch 'fix/test-fix' into 'develop'
Fix for test on mac See merge request pleroma/pleroma!3027
-rw-r--r--test/emoji_test.exs2
-rw-r--r--test/utils_test.exs2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/emoji_test.exs b/test/emoji_test.exs
index b36047578..1dd3c58c6 100644
--- 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
index 3a730d545..460f7e0b5 100644
--- 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