diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-06-03 15:29:53 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-06-03 15:29:53 -0500 |
| commit | 6ef145b4fc3f2ddb5865e84039c3b56656529711 (patch) | |
| tree | a10cab9e7561bdaa76777cfc6d0c3c6fe1f8189b /test/web/plugs | |
| parent | 5cee2fe9fea4f0c98acd49a2a288ecd44bce3d1f (diff) | |
| parent | 662e95e9484a46bfc72c2edc305aefae99ff68b0 (diff) | |
| download | pleroma-6ef145b4fc3f2ddb5865e84039c3b56656529711.tar.gz pleroma-6ef145b4fc3f2ddb5865e84039c3b56656529711.zip | |
Merge branch 'develop' into feature/digest-email
Diffstat (limited to 'test/web/plugs')
| -rw-r--r-- | test/web/plugs/federating_plug_test.exs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/test/web/plugs/federating_plug_test.exs b/test/web/plugs/federating_plug_test.exs index 612db7e32..530562325 100644 --- a/test/web/plugs/federating_plug_test.exs +++ b/test/web/plugs/federating_plug_test.exs @@ -6,11 +6,7 @@ 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) - - Application.put_env(:pleroma, :instance, instance) + Pleroma.Config.put([:instance, :federating], false) conn = build_conn() @@ -19,11 +15,7 @@ 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) + Pleroma.Config.put([:instance, :federating], true) end test "does nothing when federating is enabled" do |
