diff options
| author | Sachin Joshi <satchin.joshi@gmail.com> | 2019-06-01 11:42:37 +0545 |
|---|---|---|
| committer | Sachin Joshi <satchin.joshi@gmail.com> | 2019-06-01 11:42:37 +0545 |
| commit | ad5263c647aea65dbeb4c329825671895e0a8863 (patch) | |
| tree | 6217011a3fd2ea943498ce296de07cefe1206b87 /test/web/plugs/federating_plug_test.exs | |
| parent | 5534d4c67675901ab272ee47355ad43dfae99033 (diff) | |
| parent | f1890d2cacfa09dd22b06a8d041c04dbeba9e138 (diff) | |
| download | pleroma-ad5263c647aea65dbeb4c329825671895e0a8863.tar.gz pleroma-ad5263c647aea65dbeb4c329825671895e0a8863.zip | |
Merge remote-tracking branch 'upstream/develop' into admin-create-users
Diffstat (limited to 'test/web/plugs/federating_plug_test.exs')
| -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 |