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

Merge pull request #15030 from edx/mattdrayer/ENT-318

Browse Source 
ENT-318: Update activation email subject and message text
This commit is contained in:
Matt Drayer
2017-05-09 09:29:13 -04:00
committed by GitHub
parent 3aba9da8fa 5e94c63da6
commit cd56cc56cd
10 changed files with 60 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openedx/core/djangoapps/user_api/tests/test_helpers.py
View File

@@ -53,6 +53,7 @@ class InterceptErrorsTest(TestCase):
@mock.patch('openedx.core.djangoapps.user_api.helpers.LOGGER')
def test_logs_errors(self, mock_logger):
self.maxDiff = None
exception = 'openedx.core.djangoapps.user_api.tests.test_helpers.FakeInputException'
expected_log_msg = (
u"An unexpected error occurred when calling 'intercepted_function' with arguments '()' and "

4
openedx/core/djangoapps/user_api/tests/test_views.py
View File

@@ -1625,10 +1625,10 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, UserAPITestCase):
self.assertEqual(sent_email.to, [self.EMAIL])
self.assertEqual(
sent_email.subject,
u"Activate Your {platform} Account".format(platform=settings.PLATFORM_NAME)
u"Action Required: Activate your {platform} account".format(platform=settings.PLATFORM_NAME)
)
self.assertIn(
u"you need to activate your {platform} account".format(platform=settings.PLATFORM_NAME),
u"high-quality {platform} courses".format(platform=settings.PLATFORM_NAME),
sent_email.body
)