From 6ffa0d0477061af44a1f27af435f0ab38f7ee696 Mon Sep 17 00:00:00 2001 From: Kieran Eglin Date: Thu, 15 Feb 2024 10:07:58 -0800 Subject: [PATCH] Improved tmpfile setup and teardown for tests --- test/support/conn_case.ex | 1 + test/support/data_case.ex | 14 ++++++++++++++ test/test_helper.exs | 5 ----- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/test/support/conn_case.ex b/test/support/conn_case.ex index ff478a0..3aa5fce 100644 --- a/test/support/conn_case.ex +++ b/test/support/conn_case.ex @@ -34,6 +34,7 @@ defmodule PinchflatWeb.ConnCase do setup tags do Pinchflat.DataCase.setup_sandbox(tags) + Pinchflat.DataCase.setup_temp_filepaths() {:ok, conn: Phoenix.ConnTest.build_conn()} end end diff --git a/test/support/data_case.ex b/test/support/data_case.ex index d217749..5bf7f10 100644 --- a/test/support/data_case.ex +++ b/test/support/data_case.ex @@ -32,6 +32,20 @@ defmodule Pinchflat.DataCase do setup tags do Pinchflat.DataCase.setup_sandbox(tags) + Pinchflat.DataCase.setup_temp_filepaths() + :ok + end + + @doc """ + Sets up the temp filepaths for the media and metadata directories. + """ + def setup_temp_filepaths do + File.rm_rf!(Application.get_env(:pinchflat, :media_directory)) + File.rm_rf!(Application.get_env(:pinchflat, :metadata_directory)) + + File.mkdir_p!(Application.get_env(:pinchflat, :media_directory)) + File.mkdir_p!(Application.get_env(:pinchflat, :metadata_directory)) + :ok end diff --git a/test/test_helper.exs b/test/test_helper.exs index 56f7ccf..40d1202 100644 --- a/test/test_helper.exs +++ b/test/test_helper.exs @@ -4,8 +4,3 @@ Application.put_env(:pinchflat, :yt_dlp_runner, YtDlpRunnerMock) ExUnit.start() Ecto.Adapters.SQL.Sandbox.mode(Pinchflat.Repo, :manual) Faker.start() - -setup_all do - File.rm_rf(Application.get_env(:pinchflat, :media_directory)) - File.rm_rf(Application.get_env(:pinchflat, :metadata_directory)) -end