diff options
author | lain <lain@soykaf.club> | 2020-03-20 16:54:55 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-03-20 16:54:55 +0000 |
commit | d23e81903dfe5032bb20b92bcc7dfb47434ba669 (patch) | |
tree | db7724289ac074e0b70b7405d9080e50b8a8175d /test/workers/cron | |
parent | 5efa5b0c4a08c2bf73d6926ee7c418e31a04195c (diff) | |
parent | 1c05f539aaea32fe993e5299e656aa44c322e8de (diff) | |
download | pleroma-d23e81903dfe5032bb20b92bcc7dfb47434ba669.tar.gz pleroma-d23e81903dfe5032bb20b92bcc7dfb47434ba669.zip |
Merge branch 'clear-config-test-improvements' into 'develop'
Improved in-test config management
See merge request pleroma/pleroma!2312
Diffstat (limited to 'test/workers/cron')
-rw-r--r-- | test/workers/cron/clear_oauth_token_worker_test.exs | 2 | ||||
-rw-r--r-- | test/workers/cron/digest_emails_worker_test.exs | 2 | ||||
-rw-r--r-- | test/workers/cron/purge_expired_activities_worker_test.exs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/workers/cron/clear_oauth_token_worker_test.exs b/test/workers/cron/clear_oauth_token_worker_test.exs index f056b1a3e..df82dc75d 100644 --- a/test/workers/cron/clear_oauth_token_worker_test.exs +++ b/test/workers/cron/clear_oauth_token_worker_test.exs @@ -8,7 +8,7 @@ defmodule Pleroma.Workers.Cron.ClearOauthTokenWorkerTest do import Pleroma.Factory alias Pleroma.Workers.Cron.ClearOauthTokenWorker - clear_config([:oauth2, :clean_expired_tokens]) + setup do: clear_config([:oauth2, :clean_expired_tokens]) test "deletes expired tokens" do insert(:oauth_token, diff --git a/test/workers/cron/digest_emails_worker_test.exs b/test/workers/cron/digest_emails_worker_test.exs index 5d65b9fef..0a63bf4e0 100644 --- a/test/workers/cron/digest_emails_worker_test.exs +++ b/test/workers/cron/digest_emails_worker_test.exs @@ -11,7 +11,7 @@ defmodule Pleroma.Workers.Cron.DigestEmailsWorkerTest do alias Pleroma.User alias Pleroma.Web.CommonAPI - clear_config([:email_notifications, :digest]) + setup do: clear_config([:email_notifications, :digest]) setup do Pleroma.Config.put([:email_notifications, :digest], %{ diff --git a/test/workers/cron/purge_expired_activities_worker_test.exs b/test/workers/cron/purge_expired_activities_worker_test.exs index 56c5aa409..5864f9e5f 100644 --- a/test/workers/cron/purge_expired_activities_worker_test.exs +++ b/test/workers/cron/purge_expired_activities_worker_test.exs @@ -11,7 +11,7 @@ defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorkerTest do import Pleroma.Factory import ExUnit.CaptureLog - clear_config([ActivityExpiration, :enabled]) + setup do: clear_config([ActivityExpiration, :enabled]) test "deletes an expiration activity" do Pleroma.Config.put([ActivityExpiration, :enabled], true) |