Skip to content

Correctly set email_from_ name / address in Plone 5 #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nachtalb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Correctly set email_from_ name / address in Plone 5 #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 25 additions & 1 deletion ftw/testing/mailing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
from Products.MailHost.interfaces import IMailHost
from ftw.testing import IS_PLONE_5
from plone.registry.interfaces import IRegistry
from zope.component import getUtility


Expand All @@ -25,7 +27,18 @@ def set_up(self, configure=True):

if configure:
mockmailhost.smtp_host = 'localhost'
self.portal.email_from_address = 'test@localhost'
if IS_PLONE_5:
registry = getUtility(IRegistry, context=self.portal)

if not registry['plone.email_from_address']:
self.portal._original_email_address = registry["plone.email_from_address"]
registry['plone.email_from_address'] = 'test@localhost'

if not registry['plone.email_from_name']:
self.portal._original_email_name = registry["plone.email_from_name"]
registry['plone.email_from_name'] = u'Plone site'
else:
self.portal.email_from_address = 'test@localhost'

def tear_down(self):
# Do NOT move the MockMailHost import to the top!
Expand All @@ -39,6 +52,17 @@ def tear_down(self):
if isinstance(mailhost, MockMailHost):
sm.unregisterUtility(component=mailhost, provided=IMailHost)

if IS_PLONE_5:
registry = getUtility(IRegistry, context=self.portal)

if hasattr(self.portal, "_original_email_name"):
registry["plone.email_from_name"] = self.portal._original_email_name
delattr(self.portal, "_original_email_name")

if hasattr(self.portal, "_original_email_address"):
registry["plone.email_from_address"] = self.portal._original_email_address # noqa: E501
delattr(self.portal, "_original_email_address")

def get_mailhost(self):
mailhost = getUtility(IMailHost)

Expand Down