darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-13 10:28:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3189 from alphagov/update-tags-new-taxonomy

Browse Source 
Update Zendesk tags to reflect new taxonomy
This commit is contained in:
Chris Hill-Scott
2019-11-20 10:59:17 +00:00
committed by GitHub
parent e24b72f974 12b7c5d5e8
commit ebb29b82a9
3 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/service_settings.py
View File

@@ -1065,7 +1065,7 @@ def branding_request(service_id):
ticket_type=zendesk_client.TYPE_QUESTION,
user_email=current_user.email_address,
user_name=current_user.name,
tags=['notify_action_add_branding'],
tags=['notify_action', 'notify_branding'],
)
flash((

4
app/models/service.py
View File

@@ -615,8 +615,9 @@ class Service(JSONModel):
def _get_request_to_go_live_tags(self):
BASE = 'notify_request_to_go_live'
BASE = 'notify_go_live'
yield 'notify_action'
yield BASE
if self.go_live_checklist_completed and self.organisation.agreement_signed:
@@ -624,7 +625,6 @@ class Service(JSONModel):
return
for test, tag in (
(True, ''),
(not self.volumes, '_volumes'),
(not self.go_live_checklist_completed, '_checklist'),
(not self.organisation.agreement_signed, '_mou'),

70
tests/app/main/views/test_service_settings.py
View File

@@ -1398,7 +1398,7 @@ def test_non_gov_users_cant_request_to_go_live(
'Text messages in next year: \n'
'Letters in next year: \n'
),
['notify_request_to_go_live_incomplete_volumes']
['notify_go_live_incomplete_volumes']
),
(
(('email', 1234), ('sms', 0), ('letter', 999)),
@@ -1455,12 +1455,12 @@ def test_should_redirect_after_request_to_go_live(
user_name=active_user_with_permissions['name'],
user_email=active_user_with_permissions['email_address'],
tags=[
'notify_request_to_go_live',
'notify_request_to_go_live_incomplete',
'notify_action',
'notify_go_live',
] + extra_tags + [
'notify_request_to_go_live_incomplete_checklist',
'notify_request_to_go_live_incomplete_mou',
'notify_request_to_go_live_incomplete_team_member',
'notify_go_live_incomplete_checklist',
'notify_go_live_incomplete_mou',
'notify_go_live_incomplete_team_member',
],
)
assert mock_post.call_args[1]['message'] == (
@@ -1611,8 +1611,9 @@ def test_should_be_able_to_request_to_go_live_with_no_organisation(
'Yes',
True,
[
'notify_request_to_go_live',
'notify_request_to_go_live_complete',
'notify_action',
'notify_go_live',
'notify_go_live_complete',
],
),
( # Needs to set reply to address
@@ -1627,10 +1628,10 @@ def test_should_be_able_to_request_to_go_live_with_no_organisation(
'No',
True,
[
'notify_request_to_go_live',
'notify_request_to_go_live_incomplete',
'notify_request_to_go_live_incomplete_checklist',
'notify_request_to_go_live_incomplete_email_reply_to',
'notify_action',
'notify_go_live',
'notify_go_live_incomplete_checklist',
'notify_go_live_incomplete_email_reply_to',
],
),
( # Just sending SMS
@@ -1645,8 +1646,9 @@ def test_should_be_able_to_request_to_go_live_with_no_organisation(
'Yes',
True,
[
'notify_request_to_go_live',
'notify_request_to_go_live_complete',
'notify_action',
'notify_go_live',
'notify_go_live_complete',
],
),
( # Needs to change SMS sender
@@ -1661,10 +1663,10 @@ def test_should_be_able_to_request_to_go_live_with_no_organisation(
'No',
True,
[
'notify_request_to_go_live',
'notify_request_to_go_live_incomplete',
'notify_request_to_go_live_incomplete_checklist',
'notify_request_to_go_live_incomplete_sms_sender',
'notify_action',
'notify_go_live',
'notify_go_live_incomplete_checklist',
'notify_go_live_incomplete_sms_sender',
],
),
( # Needs team members
@@ -1679,10 +1681,10 @@ def test_should_be_able_to_request_to_go_live_with_no_organisation(
'No',
True,
[
'notify_request_to_go_live',
'notify_request_to_go_live_incomplete',
'notify_request_to_go_live_incomplete_checklist',
'notify_request_to_go_live_incomplete_team_member',
'notify_action',
'notify_go_live',
'notify_go_live_incomplete_checklist',
'notify_go_live_incomplete_team_member',
],
),
( # Needs templates
@@ -1697,10 +1699,10 @@ def test_should_be_able_to_request_to_go_live_with_no_organisation(
'No',
True,
[
'notify_request_to_go_live',
'notify_request_to_go_live_incomplete',
'notify_request_to_go_live_incomplete_checklist',
'notify_request_to_go_live_incomplete_template_content',
'notify_action',
'notify_go_live',
'notify_go_live_incomplete_checklist',
'notify_go_live_incomplete_template_content',
],
),
( # Not done anything yet
@@ -1715,13 +1717,13 @@ def test_should_be_able_to_request_to_go_live_with_no_organisation(
'No',
False,
[
'notify_request_to_go_live',
'notify_request_to_go_live_incomplete',
'notify_request_to_go_live_incomplete_volumes',
'notify_request_to_go_live_incomplete_checklist',
'notify_request_to_go_live_incomplete_mou',
'notify_request_to_go_live_incomplete_team_member',
'notify_request_to_go_live_incomplete_template_content',
'notify_action',
'notify_go_live',
'notify_go_live_incomplete_volumes',
'notify_go_live_incomplete_checklist',
'notify_go_live_incomplete_mou',
'notify_go_live_incomplete_team_member',
'notify_go_live_incomplete_template_content',
],
),
),
@@ -4648,7 +4650,7 @@ def test_submit_email_branding_request(
ticket_type='question',
user_email='test@user.gov.uk',
user_name='Test User',
tags=['notify_action_add_branding'],
tags=['notify_action', 'notify_branding'],
)
assert normalize_spaces(page.select_one('.banner-default').text) == (
'Thanks for your branding request. We’ll get back to you '