projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/configdb-error' into 'develop'
[akkoma]
/
test
/
pleroma
/
web
/
admin_api
/
controllers
/
config_controller_test.exs
diff --git
a/test/pleroma/web/admin_api/controllers/config_controller_test.exs
b/test/pleroma/web/admin_api/controllers/config_controller_test.exs
index 276e827d1b7c0a1ddbb9f59a7c6d24375f99c6b6..578a4c914074fda7524993cc306ffc431b1359aa 100644
(file)
--- a/
test/pleroma/web/admin_api/controllers/config_controller_test.exs
+++ b/
test/pleroma/web/admin_api/controllers/config_controller_test.exs
@@
-1,14
+1,13
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
- use Pleroma.Web.ConnCase
, async: true
+ use Pleroma.Web.ConnCase
import ExUnit.CaptureLog
import Pleroma.Factory
import ExUnit.CaptureLog
import Pleroma.Factory
- alias Pleroma.Config
alias Pleroma.ConfigDB
setup do
alias Pleroma.ConfigDB
setup do
@@
-27,12
+26,12
@@
defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
setup do: clear_config(:configurable_from_database, true)
test "when configuration from database is off", %{conn: conn} do
setup do: clear_config(:configurable_from_database, true)
test "when configuration from database is off", %{conn: conn} do
-
Config.put
(:configurable_from_database, false)
+
clear_config
(:configurable_from_database, false)
conn = get(conn, "/api/pleroma/admin/config")
assert json_response_and_validate_schema(conn, 400) ==
%{
conn = get(conn, "/api/pleroma/admin/config")
assert json_response_and_validate_schema(conn, 400) ==
%{
- "error" => "
To use this endpoint you need to enable configuration from databas
e."
+ "error" => "
You must enable configurable_from_database in your config fil
e."
}
end
}
end
@@
-171,7
+170,7
@@
defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
|> post("/api/pleroma/admin/config", %{"configs" => []})
assert json_response_and_validate_schema(conn, 400) ==
|> post("/api/pleroma/admin/config", %{"configs" => []})
assert json_response_and_validate_schema(conn, 400) ==
- %{"error" => "
To use this endpoint you need to enable configuration from databas
e."}
+ %{"error" => "
You must enable configurable_from_database in your config fil
e."}
end
describe "POST /api/pleroma/admin/config" do
end
describe "POST /api/pleroma/admin/config" do
@@
-410,8
+409,7
@@
defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
end
test "saving config which need pleroma reboot", %{conn: conn} do
end
test "saving config which need pleroma reboot", %{conn: conn} do
- chat = Config.get(:chat)
- on_exit(fn -> Config.put(:chat, chat) end)
+ clear_config([:chat, :enabled], true)
assert conn
|> put_req_header("content-type", "application/json")
assert conn
|> put_req_header("content-type", "application/json")
@@
-456,8
+454,7
@@
defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
end
test "update setting which need reboot, don't change reboot flag until reboot", %{conn: conn} do
end
test "update setting which need reboot, don't change reboot flag until reboot", %{conn: conn} do
- chat = Config.get(:chat)
- on_exit(fn -> Config.put(:chat, chat) end)
+ clear_config([:chat, :enabled], true)
assert conn
|> put_req_header("content-type", "application/json")
assert conn
|> put_req_header("content-type", "application/json")
@@
-1417,11
+1414,7
@@
defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
describe "GET /api/pleroma/admin/config/descriptions" do
test "structure", %{conn: conn} do
describe "GET /api/pleroma/admin/config/descriptions" do
test "structure", %{conn: conn} do
- admin = insert(:user, is_admin: true)
-
- conn =
- assign(conn, :user, admin)
- |> get("/api/pleroma/admin/config/descriptions")
+ conn = get(conn, "/api/pleroma/admin/config/descriptions")
assert [child | _others] = json_response_and_validate_schema(conn, 200)
assert [child | _others] = json_response_and_validate_schema(conn, 200)
@@
-1439,11
+1432,7
@@
defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
{:esshd}
])
{:esshd}
])
- admin = insert(:user, is_admin: true)
-
- conn =
- assign(conn, :user, admin)
- |> get("/api/pleroma/admin/config/descriptions")
+ conn = get(conn, "/api/pleroma/admin/config/descriptions")
children = json_response_and_validate_schema(conn, 200)
children = json_response_and_validate_schema(conn, 200)