hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Get rid of Pleroma.Config in favor of Application

Browse source 
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
This commit is contained in:
href 2018-11-06 11:34:34 +01:00
commit 2bc924ba45
No known key found for this signature in database
GPG key ID: EE8296C1A152C325
7 changed files with 25 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/config_test.exs
View file

@ -1,10 +0,0 @@
defmodule Pleroma.ConfigTest do
use Pleroma.DataCase
alias Pleroma.Config
test "get returns the item at the path if there is one" do
Config.put([:instance, :name], "Plemora")
assert Config.get([:instance, :name]) == "Plemora"
assert Config.get([:unknown]) == nil
end
end

16
test/web/activity_pub/activity_pub_controller_test.exs
View file

@ -4,12 +4,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
alias Pleroma.Web.ActivityPub.{UserView, ObjectView}
alias Pleroma.{Repo, User}
alias Pleroma.Activity
alias Pleroma.Config
describe "/relay" do
test "with the relay active, it returns the relay user", %{conn: conn} do
Config.put([:instance, :allow_relay], true)
res =
conn
|> get(activity_pub_path(conn, :relay))
@ -19,12 +16,23 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
end
test "with the relay disabled, it returns 404", %{conn: conn} do
Config.put([:instance, :allow_relay], false)
instance =
Application.get_env(:pleroma, :instance)
|> Keyword.put(:allow_relay, false)
Application.put_env(:pleroma, :instance, instance)
res =
conn
|> get(activity_pub_path(conn, :relay))
|> json_response(404)
instance =
Application.get_env(:pleroma, :instance)
|> Keyword.put(:allow_relay, true)
Application.put_env(:pleroma, :instance, instance)
end
end

15
test/web/federator_test.exs
View file

@ -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