Merge branch 'master' into more_wording_changes

Conflicts:
	app/templates/views/verify-mobile.html
This commit is contained in:
Martyn Inglis
2016-08-22 12:54:10 +01:00
11 changed files with 20 additions and 19 deletions

View File

@@ -42,7 +42,7 @@ def test_should_render_correct_resend_template_for_active_user(app_,
assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string == 'Resend verification code'
assert page.h1.string == 'Resend security code'
# there shouldn't be a form for updating mobile number
assert page.find('form') is None