diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-11-29 10:17:59 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-11-29 10:17:59 +0300 |
| commit | 52cc7de82cf3aa637d599edc357909be8c9366eb (patch) | |
| tree | 3331c84530c0d93c41171f83c6270c8d499f5195 /test/web/admin_api/admin_api_controller_test.exs | |
| parent | c8d3c3bfeca66d16846f97b50328e0718cfe5fef (diff) | |
| parent | d7b40dd4ba5bf3890be8a8b69d5aff84f5ffc5d2 (diff) | |
| download | pleroma-52cc7de82cf3aa637d599edc357909be8c9366eb.tar.gz pleroma-52cc7de82cf3aa637d599edc357909be8c9366eb.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# mix.lock
Diffstat (limited to 'test/web/admin_api/admin_api_controller_test.exs')
| -rw-r--r-- | test/web/admin_api/admin_api_controller_test.exs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index bb2ca6a62..32577afee 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -1923,6 +1923,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do Pleroma.Config.put([:instance, :dynamic_configuration], true) end + @tag capture_log: true test "create new config setting in db", %{conn: conn} do conn = post(conn, "/api/pleroma/admin/config", %{ |