diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-08-14 22:45:32 +0000 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-08-14 22:45:32 +0000 |
| commit | ec969eec5149c5fe2a3e676ea07384b4597487f1 (patch) | |
| tree | b725022b93c7f354116e50d54009e0dc5dc19eaf /test/config/transfer_task_test.exs | |
| parent | b27fafe161241c954b713281bebd6ffe1e990884 (diff) | |
| parent | 27b747546a7796de57e88f454b2c2810c7523f97 (diff) | |
| download | pleroma-ec969eec5149c5fe2a3e676ea07384b4597487f1.tar.gz pleroma-ec969eec5149c5fe2a3e676ea07384b4597487f1.zip | |
Merge branch 'develop' into 'fix/admin-api-user-deletion'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/config/transfer_task_test.exs')
| -rw-r--r-- | test/config/transfer_task_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/config/transfer_task_test.exs b/test/config/transfer_task_test.exs index dbeadbe87..4455a4d47 100644 --- a/test/config/transfer_task_test.exs +++ b/test/config/transfer_task_test.exs @@ -31,7 +31,7 @@ defmodule Pleroma.Config.TransferTaskTest do value: [live: 15, com: 35] }) - Pleroma.Config.TransferTask.start_link() + Pleroma.Config.TransferTask.start_link([]) assert Application.get_env(:pleroma, :test_key) == [live: 2, com: 3] assert Application.get_env(:idna, :test_key) == [live: 15, com: 35] @@ -50,7 +50,7 @@ defmodule Pleroma.Config.TransferTaskTest do }) assert ExUnit.CaptureLog.capture_log(fn -> - Pleroma.Config.TransferTask.start_link() + Pleroma.Config.TransferTask.start_link([]) end) =~ "updating env causes error, key: \"undefined_atom_key\", error: %ArgumentError{message: \"argument error\"}" end |