diff options
| author | lambda <lain@soykaf.club> | 2019-05-30 13:16:08 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-05-30 13:16:08 +0000 |
| commit | 91ac8b075b0a8c82b5e8a9d3316724e534486932 (patch) | |
| tree | 93bf99e8c7f4a9937345976380e4c534ef83d148 /test/web/plugs/federating_plug_test.exs | |
| parent | ab3f3af7cff831acde2d612d593593f4cc843542 (diff) | |
| parent | 99f70c7e2011ab29746a8a61d3a4b354f4513045 (diff) | |
| download | pleroma-91ac8b075b0a8c82b5e8a9d3316724e534486932.tar.gz pleroma-91ac8b075b0a8c82b5e8a9d3316724e534486932.zip | |
Merge branch 'use-pleroma-config' into 'develop'
Use Pleroma.Config everywhere
See merge request pleroma/pleroma!1214
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 |