summaryrefslogtreecommitdiff
path: root/test/web/ostatus/ostatus_controller_test.exs
diff options
context:
space:
mode:
authorMaksim <parallel588@gmail.com>2019-08-19 15:34:29 +0000
committerlain <lain@soykaf.club>2019-08-19 15:34:29 +0000
commita320358703db249ab20df5afd81c92fb42b8cadb (patch)
treed46f6d2447183492d75983986ae2d57b75fdcb0b /test/web/ostatus/ostatus_controller_test.exs
parent49ae3191df2a7acfa741e93d6f5142f9cf27dc06 (diff)
downloadpleroma-a320358703db249ab20df5afd81c92fb42b8cadb.tar.gz
pleroma-a320358703db249ab20df5afd81c92fb42b8cadb.zip
added test helpers to clear config after tests
Diffstat (limited to 'test/web/ostatus/ostatus_controller_test.exs')
-rw-r--r--test/web/ostatus/ostatus_controller_test.exs11
1 files changed, 4 insertions, 7 deletions
diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs
index 9f756effb..095ae7041 100644
--- a/test/web/ostatus/ostatus_controller_test.exs
+++ b/test/web/ostatus/ostatus_controller_test.exs
@@ -15,16 +15,13 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
-
- config_path = [:instance, :federating]
- initial_setting = Pleroma.Config.get(config_path)
-
- Pleroma.Config.put(config_path, true)
- on_exit(fn -> Pleroma.Config.put(config_path, initial_setting) end)
-
:ok
end
+ clear_config_all([:instance, :federating]) do
+ Pleroma.Config.put([:instance, :federating], true)
+ end
+
describe "salmon_incoming" do
test "decodes a salmon", %{conn: conn} do
user = insert(:user)