diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-10-13 17:10:34 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-10-13 17:10:34 +0300 |
| commit | 4c4ea9a3486f824cfba825a176439d50ec54fe95 (patch) | |
| tree | 992e96bbdf4b40a5738ca2306ba3acf4158b17d5 /test | |
| parent | 3cb9c88837f3105363c5a615724b6363ee926d35 (diff) | |
changes after rebase
Diffstat (limited to 'test')
| -rw-r--r-- | test/pleroma/config/deprecation_warnings_test.exs | 2 | ||||
| -rw-r--r-- | test/pleroma/emoji/pack_test.exs (renamed from test/emoji/pack_test.exs) | 0 | ||||
| -rw-r--r-- | test/pleroma/user/import_test.exs (renamed from test/user/import_test.exs) | 0 | ||||
| -rw-r--r-- | test/pleroma/user/query_test.exs (renamed from test/user/query_test.exs) | 0 | ||||
| -rw-r--r-- | test/pleroma/utils_test.exs (renamed from test/utils_test.exs) | 0 | ||||
| -rw-r--r-- | test/pleroma/web/pleroma_api/controllers/emoji_file_controller_test.exs (renamed from test/web/pleroma_api/controllers/emoji_file_controller_test.exs) | 0 | ||||
| -rw-r--r-- | test/pleroma/web/pleroma_api/controllers/user_import_controller_test.exs (renamed from test/web/pleroma_api/controllers/user_import_controller_test.exs) | 0 | ||||
| -rw-r--r-- | test/pleroma/web/rich_media/helpers_test.exs | 1 |
8 files changed, 1 insertions, 2 deletions
diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs index 02ada1aab..0cfed4555 100644 --- a/test/pleroma/config/deprecation_warnings_test.exs +++ b/test/pleroma/config/deprecation_warnings_test.exs @@ -87,7 +87,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest do end test "check_activity_expiration_config/0" do - clear_config([Pleroma.ActivityExpiration, :enabled], true) + clear_config(Pleroma.ActivityExpiration, enabled: true) assert capture_log(fn -> DeprecationWarnings.check_activity_expiration_config() diff --git a/test/emoji/pack_test.exs b/test/pleroma/emoji/pack_test.exs index 70d1eaa1b..70d1eaa1b 100644 --- a/test/emoji/pack_test.exs +++ b/test/pleroma/emoji/pack_test.exs diff --git a/test/user/import_test.exs b/test/pleroma/user/import_test.exs index e404deeb5..e404deeb5 100644 --- a/test/user/import_test.exs +++ b/test/pleroma/user/import_test.exs diff --git a/test/user/query_test.exs b/test/pleroma/user/query_test.exs index e2f5c7d81..e2f5c7d81 100644 --- a/test/user/query_test.exs +++ b/test/pleroma/user/query_test.exs diff --git a/test/utils_test.exs b/test/pleroma/utils_test.exs index 460f7e0b5..460f7e0b5 100644 --- a/test/utils_test.exs +++ b/test/pleroma/utils_test.exs diff --git a/test/web/pleroma_api/controllers/emoji_file_controller_test.exs b/test/pleroma/web/pleroma_api/controllers/emoji_file_controller_test.exs index 82de86ee3..82de86ee3 100644 --- a/test/web/pleroma_api/controllers/emoji_file_controller_test.exs +++ b/test/pleroma/web/pleroma_api/controllers/emoji_file_controller_test.exs diff --git a/test/web/pleroma_api/controllers/user_import_controller_test.exs b/test/pleroma/web/pleroma_api/controllers/user_import_controller_test.exs index 433c97e81..433c97e81 100644 --- a/test/web/pleroma_api/controllers/user_import_controller_test.exs +++ b/test/pleroma/web/pleroma_api/controllers/user_import_controller_test.exs diff --git a/test/pleroma/web/rich_media/helpers_test.exs b/test/pleroma/web/rich_media/helpers_test.exs index 4b97bd66b..4c9ee77d0 100644 --- a/test/pleroma/web/rich_media/helpers_test.exs +++ b/test/pleroma/web/rich_media/helpers_test.exs @@ -6,7 +6,6 @@ defmodule Pleroma.Web.RichMedia.HelpersTest do use Pleroma.DataCase alias Pleroma.Config - alias Pleroma.Object alias Pleroma.Web.CommonAPI alias Pleroma.Web.RichMedia.Helpers |