diff options
| author | lain <lain@soykaf.club> | 2019-10-10 14:40:59 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-10 14:40:59 +0200 |
| commit | c54ae662dcc08c0c04a1dff7bb7a361665e877b8 (patch) | |
| tree | afb9cce0d7bcc15cd2fe3221609d7883d45d0057 /test/emails/admin_email_test.exs | |
| parent | 02f8e2a8ab65c3e8497bab4576ce4e75f8df3217 (diff) | |
| parent | 6355694309b0bad3687a8a7820b81ebf6625751d (diff) | |
| download | pleroma-c54ae662dcc08c0c04a1dff7bb7a361665e877b8.tar.gz pleroma-c54ae662dcc08c0c04a1dff7bb7a361665e877b8.zip | |
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
Diffstat (limited to 'test/emails/admin_email_test.exs')
| -rw-r--r-- | test/emails/admin_email_test.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/emails/admin_email_test.exs b/test/emails/admin_email_test.exs index 9e83c73c6..ad89f9213 100644 --- a/test/emails/admin_email_test.exs +++ b/test/emails/admin_email_test.exs @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Emails.AdminEmailTest do @@ -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]} |