hamlab/mobilizon-frontend
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Refactoring of config wrapper

Browse Source
This commit is contained in:
miffy
2019-09-08 00:05:54 +02:00
parent 96f51d3a27
commit a32ab590ab
25 changed files with 207 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/mobilizon_web/controllers/activity_pub_controller_test.exs
View File

@@ -8,7 +8,7 @@ defmodule MobilizonWeb.ActivityPubControllerTest do
import Mobilizon.Factory
alias MobilizonWeb.ActivityPub.ActorView
alias MobilizonWeb.PageView
alias Mobilizon.Actors
alias Mobilizon.{Actors, Config}
alias Mobilizon.Actors.Actor
alias Mobilizon.Service.ActivityPub
use ExVCR.Mock, adapter: ExVCR.Adapter.Hackney
@@ -290,14 +290,14 @@ defmodule MobilizonWeb.ActivityPubControllerTest do
end
test "with the relay disabled, it returns 404", %{conn: conn} do
Mobilizon.CommonConfig.put([:instance, :allow_relay], false)
Config.put([:instance, :allow_relay], false)
conn
|> get(activity_pub_path(conn, :relay))
|> json_response(404)
|> assert
Mobilizon.CommonConfig.put([:instance, :allow_relay], true)
Config.put([:instance, :allow_relay], true)
end
end

12
test/mobilizon_web/controllers/nodeinfo_controller_test.exs
View File

@@ -1,7 +1,7 @@
defmodule MobilizonWeb.NodeInfoControllerTest do
use MobilizonWeb.ConnCase
@instance Application.get_env(:mobilizon, :instance)
alias Mobilizon.Config
test "Get node info schemas", %{conn: conn} do
conn = get(conn, node_info_path(conn, :schemas))
@@ -37,16 +37,16 @@ defmodule MobilizonWeb.NodeInfoControllerTest do
assert resp == %{
"metadata" => %{
"nodeName" => Mobilizon.CommonConfig.instance_name(),
"nodeDescription" => Mobilizon.CommonConfig.instance_description()
"nodeName" => Config.instance_name(),
"nodeDescription" => Config.instance_description()
},
"openRegistrations" => Keyword.get(@instance, :registrations_open),
"openRegistrations" => Config.instance_registrations_open?(),
"protocols" => ["activitypub"],
"services" => %{"inbound" => [], "outbound" => ["atom1.0"]},
"software" => %{
"name" => "mobilizon",
"version" => Keyword.get(@instance, :version),
"repository" => Keyword.get(@instance, :repository)
"version" => Config.instance_version(),
"repository" => Config.instance_repository()
},
"usage" => %{"localComments" => 0, "localPosts" => 0, "users" => %{"total" => 0}},
"version" => "2.1"