diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-26 03:12:03 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-26 03:12:03 +0000 |
| commit | a39e065916f16a5fe111cd6e6c73d211dbd1b9f5 (patch) | |
| tree | 76880e696f24284ace852a03c3008d48c057f5fe /test/web/admin_api/admin_api_controller_test.exs | |
| parent | 48a82c46096a560fe9331a63f19ace6faaf98c3d (diff) | |
| parent | 5e9759cd7d0730c14bcc44e9b3dbda94947d602f (diff) | |
| download | pleroma-a39e065916f16a5fe111cd6e6c73d211dbd1b9f5.tar.gz | |
Merge branch 'feature/return-link-for-password-reset' into 'develop'
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
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, 3 insertions, 1 deletions
diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index f00e02a7a..00e64692a 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -586,7 +586,9 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do |> put_req_header("accept", "application/json") |> get("/api/pleroma/admin/users/#{user.nickname}/password_reset") - assert conn.status == 200 + resp = json_response(conn, 200) + + assert Regex.match?(~r/(http:\/\/|https:\/\/)/, resp["link"]) end describe "GET /api/pleroma/admin/users" do |