X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fplugs%2Ffederating_plug_test.exs;h=2f8aadadcfac1d98a605ade71b302265f0083d5b;hb=8bacdc36806efd01a7897359ff0fd2c8e24730d2;hp=612db7e32e608cfeec6479bf04fda039e6140c11;hpb=922abcda61298a7bca48894cb9a51a52fdeab1ed;p=akkoma

diff --git a/test/web/plugs/federating_plug_test.exs b/test/web/plugs/federating_plug_test.exs
index 612db7e32..2f8aadadc 100644
--- a/test/web/plugs/federating_plug_test.exs
+++ b/test/web/plugs/federating_plug_test.exs
@@ -1,16 +1,14 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.FederatingPlugTest do
   use Pleroma.Web.ConnCase
 
-  test "returns and halt the conn when federating is disabled" do
-    instance =
-      Application.get_env(:pleroma, :instance)
-      |> Keyword.put(:federating, false)
+  setup do: clear_config([:instance, :federating])
 
-    Application.put_env(:pleroma, :instance, instance)
+  test "returns and halt the conn when federating is disabled" do
+    Pleroma.Config.put([:instance, :federating], false)
 
     conn =
       build_conn()
@@ -18,15 +16,11 @@ defmodule Pleroma.Web.FederatingPlugTest do
 
     assert conn.status == 404
     assert conn.halted
-
-    instance =
-      Application.get_env(:pleroma, :instance)
-      |> Keyword.put(:federating, true)
-
-    Application.put_env(:pleroma, :instance, instance)
   end
 
   test "does nothing when federating is enabled" do
+    Pleroma.Config.put([:instance, :federating], true)
+
     conn =
       build_conn()
       |> Pleroma.Web.FederatingPlug.call(%{})