Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bulk email i18n tests under Python 3 BOM-927 (#22052)

Browse Source
This commit is contained in:
Jeremy Bowman
2019-10-17 10:40:47 -04:00
committed by GitHub
parent 14f9b5dd35
commit b351e58c25
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/djangoapps/bulk_email/tests/test_email.py
View File

@@ -158,9 +158,9 @@ class SendEmailWithMockedUgettextMixin(object):
e.g.
>>> mock_ugettext('Hello') == '@AR Hello@'
>>> mock_ugettext('Hello') == 'AR Hello'
"""
return u'@{lang} {text}@'.format(
return u'{lang} {text}'.format(
lang=get_language().upper(),
text=text,
)
@@ -193,7 +193,7 @@ class LocalizedFromAddressPlatformLangTestCase(SendEmailWithMockedUgettextMixin,
"""
self.assertIsNone(self.course.language) # Sanity check
message = self.send_email()
self.assertRegexpMatches(message.from_email, '@EO .* Course Staff@')
self.assertRegexpMatches(message.from_email, 'EO .* Course Staff')
@patch.dict(settings.FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True, 'REQUIRE_COURSE_EMAIL_AUTH': False})
@@ -225,7 +225,7 @@ class LocalizedFromAddressCourseLangTestCase(SendEmailWithMockedUgettextMixin, E
The course language should override the platform's.
"""
message = self.send_email()
self.assertRegexpMatches(message.from_email, '@AR .* Course Staff@')
self.assertRegexpMatches(message.from_email, 'AR .* Course Staff')
@patch('bulk_email.models.html_to_text', Mock(return_value='Mocking CourseEmail.text_message', autospec=True))