diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-10-07 15:41:41 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-10-07 15:41:41 +0300 |
| commit | 35068baf65f1be9ac4e5ae8d08222244ae823fcc (patch) | |
| tree | 0ed0b88fd100fb3df83400c147ab9a6a88d53c73 /test/emails/admin_email_test.exs | |
| parent | 7aceaa517be7b109a9acc15fb4914535b536b66c (diff) | |
| parent | 0a99f1e8c5551dcf170722e5087a0401b2d907af (diff) | |
| download | pleroma-35068baf65f1be9ac4e5ae8d08222244ae823fcc.tar.gz pleroma-35068baf65f1be9ac4e5ae8d08222244ae823fcc.zip | |
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
Diffstat (limited to 'test/emails/admin_email_test.exs')
| -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..ad89f9213 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.feed_url(Pleroma.Web.Endpoint, :feed_redirect, reporter.id) + account_url = Helpers.feed_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]} |