diff options
| author | lain <lain@soykaf.club> | 2020-11-10 11:04:19 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-11-10 11:04:19 +0000 |
| commit | 88f6b61a5e31856eb4cee204adf3fc9a6ab78d76 (patch) | |
| tree | 529aaaa394fb05ac8598fd9f0a2a48c60d5f4b9f /test | |
| parent | d77fd6b3d0f0d13e601244bab46152420f598080 (diff) | |
| parent | 5ddf0be208b1a2703f24c907ac5a07cb8ea12f8c (diff) | |
| download | pleroma-88f6b61a5e31856eb4cee204adf3fc9a6ab78d76.tar.gz | |
Merge branch '2260-wrong-report-link' into 'develop'
Resolve "Wrong user link in Report email"
Closes #2260
See merge request pleroma/pleroma!3121
Diffstat (limited to 'test')
| -rw-r--r-- | test/pleroma/emails/admin_email_test.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/pleroma/emails/admin_email_test.exs b/test/pleroma/emails/admin_email_test.exs index 155057f3e..0da0699cc 100644 --- a/test/pleroma/emails/admin_email_test.exs +++ b/test/pleroma/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.user_feed_url(Pleroma.Web.Endpoint, :feed_redirect, reporter.id) - account_url = Helpers.user_feed_url(Pleroma.Web.Endpoint, :feed_redirect, account.id) + reporter_url = reporter.ap_id + account_url = account.ap_id assert res.to == [{to_user.name, to_user.email}] assert res.from == {config[:name], config[:notify_email]} @@ -54,7 +54,7 @@ defmodule Pleroma.Emails.AdminEmailTest do res = AdminEmail.new_unapproved_registration(to_user, account) - account_url = Helpers.user_feed_url(Pleroma.Web.Endpoint, :feed_redirect, account.id) + account_url = account.ap_id assert res.to == [{to_user.name, to_user.email}] assert res.from == {config[:name], config[:notify_email]} |