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

Updates:

Browse Source 
* Fix tests
* Add tests for new message format
This commit is contained in:
Imdad Ahad
2016-10-24 16:10:41 +01:00
parent ae48bdef98
commit a707bd546c
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/main/forms.py
View File

@@ -347,25 +347,25 @@ class Feedback(Form):
class RequestToGoLiveForm(Form):
channel = StringField(
'Are you sending emails or text messages or both?'
, validators=[DataRequired(message='Can’t be empty')]
'Are you sending emails or text messages or both?',
validators=[DataRequired(message='Can’t be empty')]
)
start_date = StringField(
'When will you be ready to start sending messages?'
, validators=[DataRequired(message='Can’t be empty')]
'When will you be ready to start sending messages?',
validators=[DataRequired(message='Can’t be empty')]
)
start_volume = StringField(
'How many messages do you expect to send per month to start with? Give an estimate in numbers.'
, validators=[DataRequired(message='Can’t be empty')]
'How many messages do you expect to send per month to start with? Give an estimate in numbers.',
validators=[DataRequired(message='Can’t be empty')]
)
peak_volume = StringField(
'Will the number of messages a month increase and when will that start? Give an estimate.'
, validators=[DataRequired(message='Can’t be empty')]
'Will the number of messages a month increase and when will that start? Give an estimate.',
validators=[DataRequired(message='Can’t be empty')]
)
upload_or_api = StringField(
'Are you uploading a list of contacts that you’re sending your message to, ' +
'or are you integrating your system with ours?'
, validators=[DataRequired(message='Can’t be empty')]
'or are you integrating your system with ours?',
validators=[DataRequired(message='Can’t be empty')]
)

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

@@ -313,7 +313,13 @@ def test_should_redirect_after_request_to_go_live(
client.login(api_user_active)
response = client.post(
url_for('main.service_request_to_go_live', service_id='6ce466d0-fd6a-11e5-82f5-e0accb9d11a6'),
data={'usage': "One million messages"},
data={
'channel': 'Email',
'start_date': '01/01/2017',
'start_volume': '100,000',
'peak_volume': '2,000,000',
'upload_or_api': 'api'
},
follow_redirects=True
)
assert response.status_code == 200
@@ -323,13 +329,20 @@ def test_should_redirect_after_request_to_go_live(
'subject': 'Request to go live',
'department_id': ANY,
'agent_team_id': ANY,
'message': ANY, # noqa
'message': ANY,
'person_name': api_user_active.name,
'person_email': api_user_active.email_address
},
headers=ANY
)
returned_message = mock_post.call_args[1]['data']['message']
assert 'Email' in returned_message
assert '01/01/2017' in returned_message
assert '100,000' in returned_message
assert '2,000,000' in returned_message
assert 'api' in returned_message
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
flash_banner = page.find('div', class_='banner-default').string.strip()
h1 = page.find('h1').string.strip()
@@ -362,7 +375,13 @@ def test_log_error_on_request_to_go_live(
with pytest.raises(InternalServerError):
resp = client.post(
url_for('main.service_request_to_go_live', service_id='6ce466d0-fd6a-11e5-82f5-e0accb9d11a6'),
data={'usage': 'blah'}
data={
'channel': 'channel',
'start_date': 'start_date',
'start_volume': 'start_volume',
'peak_volume': 'peak_volume',
'upload_or_api': 'upload_or_api'
}
)
mock_logger.assert_called_with(
"Deskpro create ticket request failed with {} '{}'".format(mock_post().status_code, mock_post().json())