summaryrefslogtreecommitdiff
path: root/test/test_helper.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2019-09-19 10:59:09 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2019-09-19 10:59:09 +0300
commit6f67aed3acf557bb1e37415af82acd97e46c9ac4 (patch)
tree9155b5d55ad25d6e82ea1d365dd973addc30d1da /test/test_helper.exs
parente4f3d7f69d5d3db787f8b4906cacc673e2f970f1 (diff)
parentf95a2b2cda236f7c0e5ced2a4698e2b10d99fa53 (diff)
downloadpleroma-6f67aed3acf557bb1e37415af82acd97e46c9ac4.tar.gz
pleroma-6f67aed3acf557bb1e37415af82acd97e46c9ac4.zip
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts: # lib/pleroma/web/admin_api/admin_api_controller.ex
Diffstat (limited to 'test/test_helper.exs')
-rw-r--r--test/test_helper.exs7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/test_helper.exs b/test/test_helper.exs
index a927b2c3d..c8dbee010 100644
--- a/test/test_helper.exs
+++ b/test/test_helper.exs
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
os_exclude = if :os.type() == {:unix, :darwin}, do: [skip_on_mac: true], else: []
@@ -7,3 +7,8 @@ ExUnit.start(exclude: os_exclude)
Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, :manual)
Mox.defmock(Pleroma.ReverseProxy.ClientMock, for: Pleroma.ReverseProxy.Client)
{:ok, _} = Application.ensure_all_started(:ex_machina)
+
+ExUnit.after_suite(fn _results ->
+ uploads = Pleroma.Config.get([Pleroma.Uploaders.Local, :uploads], "test/uploads")
+ File.rm_rf!(uploads)
+end)