diff options
author | href <href@random.sh> | 2018-11-06 11:34:34 +0100 |
---|---|---|
committer | href <href@random.sh> | 2018-11-06 15:12:53 +0100 |
commit | 2bc924ba451b1a324663133632093914192cec2d (patch) | |
tree | fbee2b582ce477f9db6f0dce5e9a7add4867902d /test/web/federator_test.exs | |
parent | 0f6c4635a64e89cc72921456e6cfa3d488d894bf (diff) | |
download | pleroma-2bc924ba451b1a324663133632093914192cec2d.tar.gz pleroma-2bc924ba451b1a324663133632093914192cec2d.zip |
Get rid of Pleroma.Config in favor of Application
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
Diffstat (limited to 'test/web/federator_test.exs')
-rw-r--r-- | test/web/federator_test.exs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/test/web/federator_test.exs b/test/web/federator_test.exs index 966702935..88aef0d0f 100644 --- a/test/web/federator_test.exs +++ b/test/web/federator_test.exs @@ -1,7 +1,6 @@ defmodule Pleroma.Web.FederatorTest do alias Pleroma.Web.Federator alias Pleroma.Web.CommonAPI - alias Pleroma.Config use Pleroma.DataCase import Pleroma.Factory import Mock @@ -40,8 +39,6 @@ defmodule Pleroma.Web.FederatorTest do activity: activity, relay_mock: relay_mock } do - Config.put([:instance, :allow_relay], true) - with_mocks([relay_mock]) do Federator.handle(:publish, activity) end @@ -53,13 +50,23 @@ defmodule Pleroma.Web.FederatorTest do activity: activity, relay_mock: relay_mock } do - Config.put([:instance, :allow_relay], false) + instance = + Application.get_env(:pleroma, :instance) + |> Keyword.put(:allow_relay, false) + + Application.put_env(:pleroma, :instance, instance) with_mocks([relay_mock]) do Federator.handle(:publish, activity) end refute_received :relay_publish + + instance = + Application.get_env(:pleroma, :instance) + |> Keyword.put(:allow_relay, true) + + Application.put_env(:pleroma, :instance, instance) end end end |