diff options
| author | Sachin Joshi <satchin.joshi@gmail.com> | 2019-05-23 09:45:12 +0200 |
|---|---|---|
| committer | Sachin Joshi <satchin.joshi@gmail.com> | 2019-05-23 09:45:12 +0200 |
| commit | 0c53d91f3bfe7bbd8d8b9ffd332ac2f57b6aba34 (patch) | |
| tree | 724bd17a5ed9d89827b3095e149cfda4fb10fe61 /test/web/admin_api/admin_api_controller_test.exs | |
| parent | 17bfd000d7d44ff13cf7becbfd9ce08b896d66eb (diff) | |
| parent | 75e78d4e239a5c999306e92b181b0e29c52dc9db (diff) | |
| download | pleroma-0c53d91f3bfe7bbd8d8b9ffd332ac2f57b6aba34.tar.gz | |
fix merge conflict
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 ca12c7215..c15c67e31 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -397,14 +397,14 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do end end - test "/api/pleroma/admin/invite_token" do + test "/api/pleroma/admin/users/invite_token" do admin = insert(:user, info: %{is_admin: true}) conn = build_conn() |> assign(:user, admin) |> put_req_header("accept", "application/json") - |> get("/api/pleroma/admin/invite_token") + |> get("/api/pleroma/admin/users/invite_token") assert conn.status == 200 end |