diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-22 20:00:51 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-22 20:00:51 +0300 |
commit | e7fb593d130e0ad62e3690dce4a0913fe3d40ef0 (patch) | |
tree | 8edbc679acda1e5e024884c12cbceb2509417033 /test/tasks/config_test.exs | |
parent | b03aeae8b935b0a211c51cc3be5f1c15591f5a2f (diff) | |
parent | 28f8fcf8b034223209ec451d0c2c836124ec93f4 (diff) | |
download | pleroma-e7fb593d130e0ad62e3690dce4a0913fe3d40ef0.tar.gz pleroma-e7fb593d130e0ad62e3690dce4a0913fe3d40ef0.zip |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/tasks/config_test.exs')
-rw-r--r-- | test/tasks/config_test.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/tasks/config_test.exs b/test/tasks/config_test.exs index 3dee4f082..04bc947a9 100644 --- a/test/tasks/config_test.exs +++ b/test/tasks/config_test.exs @@ -38,7 +38,7 @@ defmodule Mix.Tasks.Pleroma.ConfigTest do on_exit(fn -> Application.put_env(:quack, :level, initial) end) end - test "settings are migrated to db" do + test "filtered settings are migrated to db" do assert Repo.all(ConfigDB) == [] Mix.Tasks.Pleroma.Config.migrate_to_db("test/fixtures/config/temp.secret.exs") @@ -47,6 +47,7 @@ defmodule Mix.Tasks.Pleroma.ConfigTest do config2 = ConfigDB.get_by_params(%{group: ":pleroma", key: ":second_setting"}) config3 = ConfigDB.get_by_params(%{group: ":quack", key: ":level"}) refute ConfigDB.get_by_params(%{group: ":pleroma", key: "Pleroma.Repo"}) + refute ConfigDB.get_by_params(%{group: ":postgrex", key: ":json_library"}) assert ConfigDB.from_binary(config1.value) == [key: "value", key2: [Repo]] assert ConfigDB.from_binary(config2.value) == [key: "value2", key2: ["Activity"]] |