projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/mastofe-install-script' 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 4e897455f03bbc0b241fa04052898def8556639e..e6b203e7470685ba5838df176072fd93ed834a2b 100644
(file)
--- a/
test/pleroma/web/admin_api/controllers/config_controller_test.exs
+++ b/
test/pleroma/web/admin_api/controllers/config_controller_test.exs
@@
-162,7
+162,9
@@
defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
end
end
end
end
- test "POST /api/pleroma/admin/config error", %{conn: conn} do
+ test "POST /api/pleroma/admin/config with configdb disabled", %{conn: conn} do
+ clear_config(:configurable_from_database, false)
+
conn =
conn
|> put_req_header("content-type", "application/json")
conn =
conn
|> put_req_header("content-type", "application/json")
@@
-1415,11
+1417,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)
@@
-1437,11
+1435,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)