Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/utils/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
)
from utils.logic import generate_sitemap
from utils.testing import helpers
from utils.testing.context_managers import janeway_setting_override
from utils.shared import clear_cache
from utils.notify_plugins import notify_email

Expand Down Expand Up @@ -468,6 +469,28 @@ def test_send_submission_acknowledgement(self):
expected_subject = "[{0}] {1}".format(self.journal_one.code, subject_setting)
self.assertEqual(expected_subject, mail.outbox[1].subject)

def test_send_submission_acknowledgement_uses_journal_replyto(self):
kwargs = dict(**self.base_kwargs)
kwargs["article"] = self.submitted_article

with janeway_setting_override(
"general", "replyto_address", self.journal_one, "replyto@example.com"
):
send_submission_acknowledgement(**kwargs)

self.assertEqual(mail.outbox[1].reply_to, ["replyto@example.com"])

def test_send_submission_acknowledgement_falls_back_to_noreply(self):
kwargs = dict(**self.base_kwargs)
kwargs["article"] = self.submitted_article

with janeway_setting_override(
"general", "replyto_address", self.journal_one, ""
):
send_submission_acknowledgement(**kwargs)

self.assertIn(settings.DUMMY_EMAIL_DOMAIN, mail.outbox[1].reply_to[0])

def test_send_article_decision(self):
kwargs = dict(**self.base_kwargs)
kwargs["article"] = self.article_under_review
Expand Down
5 changes: 4 additions & 1 deletion src/utils/transactional_emails.py
Original file line number Diff line number Diff line change
Expand Up @@ -499,14 +499,17 @@ def send_submission_acknowledgement(**kwargs):

editor_emails |= {editor.email for editor in assigned_to_section}

replyto_address = request.journal.get_setting("general", "replyto_address")
notify_helpers.send_email_with_body_from_setting_template(
request,
"editor_new_submission",
"subject_editor_new_submission",
editor_emails,
context,
log_dict=log_dict,
custom_reply_to=[f"noreply{settings.DUMMY_EMAIL_DOMAIN}"],
custom_reply_to=[replyto_address]
if replyto_address
else [f"noreply{settings.DUMMY_EMAIL_DOMAIN}"],
)


Expand Down
Loading