openstack/adjutant
Code Issues Proposed changes

Merge "Fix some issues with updating user email defaults"

Browse Source
This commit is contained in:
Zuul 2021-10-26 06:52:13 +00:00 committed by Gerrit Code Review
commit b305d7285f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
adjutant/api/v1/tests/test_api_taskview.py
View File

@ -967,7 +967,7 @@ class DelegateAPITests(AdjutantAPITestCase):
self.assertEqual(response.status_code, status.HTTP_202_ACCEPTED) self.assertEqual(response.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual(response.json(), {"notes": ["task created"]}) self.assertEqual(response.json(), {"notes": ["task created"]})
self.assertEqual(len(mail.outbox), 1) self.assertEqual(len(mail.outbox), 2)
new_token = Token.objects.all()[0] new_token = Token.objects.all()[0]
url = "/v1/tokens/" + new_token.token url = "/v1/tokens/" + new_token.token
@ -976,6 +976,7 @@ class DelegateAPITests(AdjutantAPITestCase):
response = self.client.post(url, data, format="json") response = self.client.post(url, data, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(user.email, "new_test@example.com") self.assertEqual(user.email, "new_test@example.com")
self.assertEqual(len(mail.outbox), 3)
def test_update_email_task_not_authenticated(self): def test_update_email_task_not_authenticated(self):
""" """

2
adjutant/tasks/v1/users.py
View File

@ -77,7 +77,7 @@ class UpdateUserEmail(BaseTask):
] ]
action_config = { action_config = {
"SendAdditionalEmailAction": { "SendAdditionalEmailAction": {
"initial": { "prepare": {
"subject": "OpenStack Email Update Requested", "subject": "OpenStack Email Update Requested",
"template": "update_user_email_started.txt", "template": "update_user_email_started.txt",
"email_current_user": True, "email_current_user": True,