diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-31 20:38:58 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-31 20:38:58 +0300 |
commit | 1b49b8efe57256b3f64b4b7e8a1de805ab030814 (patch) | |
tree | 2250cc1eb3d17b79c292b4ff4130172a6dea6c31 /test/pleroma/web/node_info_test.exs | |
parent | 6fd4163ab60be07b1a20ac8911e105ddca8e2095 (diff) | |
parent | 7ac0a819811496fe512544e91b6f0ff3d15b8856 (diff) | |
download | pleroma-1b49b8efe57256b3f64b4b7e8a1de805ab030814.tar.gz pleroma-1b49b8efe57256b3f64b4b7e8a1de805ab030814.zip |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/pleroma/web/node_info_test.exs')
-rw-r--r-- | test/pleroma/web/node_info_test.exs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/test/pleroma/web/node_info_test.exs b/test/pleroma/web/node_info_test.exs index 888b62791..ee6fdaae8 100644 --- a/test/pleroma/web/node_info_test.exs +++ b/test/pleroma/web/node_info_test.exs @@ -7,8 +7,6 @@ defmodule Pleroma.Web.NodeInfoTest do import Pleroma.Factory - alias Pleroma.Config - setup do: clear_config([:mrf_simple]) setup do: clear_config(:instance) @@ -93,7 +91,7 @@ defmodule Pleroma.Web.NodeInfoTest do assert "safe_dm_mentions" in response["metadata"]["features"] - Config.put([:instance, :safe_dm_mentions], false) + clear_config([:instance, :safe_dm_mentions], false) response = conn @@ -107,7 +105,7 @@ defmodule Pleroma.Web.NodeInfoTest do setup do: clear_config([:instance, :federating]) test "it shows if federation is enabled/disabled", %{conn: conn} do - Config.put([:instance, :federating], true) + clear_config([:instance, :federating], true) response = conn @@ -116,7 +114,7 @@ defmodule Pleroma.Web.NodeInfoTest do assert response["metadata"]["federation"]["enabled"] == true - Config.put([:instance, :federating], false) + clear_config([:instance, :federating], false) response = conn |