diff options
| author | lain <lain@soykaf.club> | 2020-01-28 16:14:23 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-01-28 16:14:23 +0000 |
| commit | 10762ea2ac98cd27898af1d66bd5775bfeb15c5c (patch) | |
| tree | d37b214ff074084c747cf7a7fa962cbf14e86f3c /test/emails | |
| parent | 271935953a384eb97606fb48d1b5c7befaf588e4 (diff) | |
| parent | d385789a450d455019c8aa6b6ee6abd28d5648e8 (diff) | |
| download | pleroma-10762ea2ac98cd27898af1d66bd5775bfeb15c5c.tar.gz pleroma-10762ea2ac98cd27898af1d66bd5775bfeb15c5c.zip | |
Merge branch 'feature/tag_feed' into 'develop'
[#1452] Atom feeds for hashtags
See merge request pleroma/pleroma!2040
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]} |