diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-07 11:06:30 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-07 11:06:30 +0300 |
| commit | 28fb98d69e31ce5a09e15e213491b880430a0902 (patch) | |
| tree | 2910113e8a4ed4d225a4ffc8b6b95d56e782367f /test/emails | |
| parent | f459aabdfafa990b33610438650f882ccac072d2 (diff) | |
| parent | b4f3c16885a489c40de82e5ef321caafa4b10c81 (diff) | |
| download | pleroma-28fb98d69e31ce5a09e15e213491b880430a0902.tar.gz pleroma-28fb98d69e31ce5a09e15e213491b880430a0902.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/emails')
| -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 31eac5f12..02c277a33 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]} |