diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-09-16 20:30:42 +0300 | 
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-09-16 20:30:42 +0300 | 
| commit | 76c3e290fcb211ba21bf78711d832edbfc8f8979 (patch) | |
| tree | cb8c3846ceb42b261c58dd294a55c553524ade34 /test/web/admin_api/admin_api_controller_test.exs | |
| parent | d7457c9165b83c0f1514cf0532b5a8bdc515ea02 (diff) | |
| parent | a58f29b826333c1ecb0907228f0e087a3ecd9778 (diff) | |
| download | pleroma-76c3e290fcb211ba21bf78711d832edbfc8f8979.tar.gz pleroma-76c3e290fcb211ba21bf78711d832edbfc8f8979.zip | |
Merge develop
Diffstat (limited to 'test/web/admin_api/admin_api_controller_test.exs')
| -rw-r--r-- | test/web/admin_api/admin_api_controller_test.exs | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index 3b6d75a4c..516de5d0c 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -2096,7 +2096,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do          post(conn, "/api/pleroma/admin/config", %{            configs: [              %{ -              "group" => "pleroma_job_queue", +              "group" => "oban",                "key" => ":queues",                "value" => [                  %{"tuple" => [":federator_incoming", 50]}, @@ -2114,7 +2114,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do        assert json_response(conn, 200) == %{                 "configs" => [                   %{ -                   "group" => "pleroma_job_queue", +                   "group" => "oban",                     "key" => ":queues",                     "value" => [                       %{"tuple" => [":federator_incoming", 50]}, | 
