diff options
author | rinpatch <rinpatch@sdf.org> | 2020-01-30 22:16:55 +0300 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-01-30 22:16:55 +0300 |
commit | 5b62acf6e9a38f8d14a9fb37cc85e646fb0169e3 (patch) | |
tree | 6677ba80418ffd34a78cba75498f2c1ab48ba14c /test/emails | |
parent | 45180d4c6058f790475d8ff28018c912db105082 (diff) | |
parent | 946de2299cccebac6718e3a132397ff5c06c67ee (diff) | |
download | pleroma-5b62acf6e9a38f8d14a9fb37cc85e646fb0169e3.tar.gz pleroma-5b62acf6e9a38f8d14a9fb37cc85e646fb0169e3.zip |
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
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 ad89f9213..383cc3459 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.feed_url(Pleroma.Web.Endpoint, :feed_redirect, reporter.id) - account_url = Helpers.feed_url(Pleroma.Web.Endpoint, :feed_redirect, account.id) + 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) assert res.to == [{to_user.name, to_user.email}] assert res.from == {config[:name], config[:notify_email]} |