diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-06 14:59:58 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-06 14:59:58 +0000 |
| commit | 10f4ce848a7a4edd4d420642f1ad9e7fca009f85 (patch) | |
| tree | b23321bccbcd7e7686a593d46e62036cd39173fe /test | |
| parent | 294e08cb65940ff193d6920e576f56718a5623f4 (diff) | |
| parent | 2a2d834ff75fc9d2e89ffda392d49f0ad29c45c1 (diff) | |
| download | pleroma-10f4ce848a7a4edd4d420642f1ad9e7fca009f85.tar.gz | |
Merge branch 'backport/fix-report-email' into 'maint/1.1'
backport: Use the user.id instead of nickname in report URLs
See merge request pleroma/pleroma!1802
Diffstat (limited to 'test')
| -rw-r--r-- | test/emails/admin_email_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/emails/admin_email_test.exs b/test/emails/admin_email_test.exs index 9e83c73c6..594f03959 100644 --- a/test/emails/admin_email_test.exs +++ b/test/emails/admin_email_test.exs @@ -19,8 +19,8 @@ defmodule Pleroma.Emails.AdminEmailTest do AdminEmail.report(to_user, reporter, account, [%{name: "Test", id: "12"}], "Test comment") status_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, "12") - reporter_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, reporter.nickname) - account_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, account.nickname) + reporter_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, reporter.id) + account_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, account.id) assert res.to == [{to_user.name, to_user.email}] assert res.from == {config[:name], config[:notify_email]} |