diff options
| author | lain <lain@soykaf.club> | 2019-10-07 12:31:51 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-07 12:31:51 +0000 |
| commit | 6c278cfe09fb9fd5220743d8f69c6e232623a09b (patch) | |
| tree | 93f1716551e6677193b05f33583579e68ad512c2 /test/emails/admin_email_test.exs | |
| parent | e8395bedd2164723b641e1e28cf08e40875893bf (diff) | |
| parent | 0a99f1e8c5551dcf170722e5087a0401b2d907af (diff) | |
| download | pleroma-6c278cfe09fb9fd5220743d8f69c6e232623a09b.tar.gz pleroma-6c278cfe09fb9fd5220743d8f69c6e232623a09b.zip | |
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
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 02c277a33..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.id) - account_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, account.id) + 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]} |