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

Merge branch 'master' into use_new_template_stats_endpoint

Browse Source 
Conflicts:
	app/notify_client/template_statistics_api_client.py
This commit is contained in:
Martyn Inglis
2016-08-22 16:47:42 +01:00
parent 63fa77fde7 8a04770c8e
commit 9fbd410474
9 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/main/test_validators.py
View File

@@ -141,4 +141,4 @@ def test_sms_sender_form_validation(app_, mock_get_user_by_email):
form.sms_sender.data = '###########'
form.validate()
assert 'Sms text message sender can only contain alpha-numeric characters' == form.errors['sms_sender'][0]
assert 'Text message sender can only contain alpha-numeric characters' == form.errors['sms_sender'][0]

2
tests/app/main/views/test_code_not_received.py
View File

@@ -66,7 +66,7 @@ def test_should_render_correct_resend_template_for_pending_user(app_,
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string == 'Check your mobile number'
expected = 'Check your mobile phone number is correct and then resend the confirmation code.'
expected = 'Check your mobile phone number is correct and then resend the security code.'
message = page.find_all('p')[1].text
assert message == expected
assert page.find('form').input['value'] == api_user_pending.mobile_number