diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-06-03 09:12:17 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-06-03 09:12:17 -0500 |
| commit | f4e2595592ccca6cedd64669baef7bdd2a6547d0 (patch) | |
| tree | 6806a79345c7599b0d436df8b6c46e75b54d1292 /test/web/plugs | |
| parent | 3c4cab9be18ff543d025177b418ddd0b16050e68 (diff) | |
| parent | 9789e000b05621435dc0c03833f564481e0b80e6 (diff) | |
| download | pleroma-f4e2595592ccca6cedd64669baef7bdd2a6547d0.tar.gz pleroma-f4e2595592ccca6cedd64669baef7bdd2a6547d0.zip | |
Merge branch 'develop' into update-oauth-template
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 |