Merge branch 'master' into use_new_template_stats_endpoint

tests/app/main/views/test_code_not_received.py

@@ -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
 

tests/app/main/views/test_two_factor.py

@@ -17,7 +17,7 @@ def test_should_render_two_factor_page(app_,
                     'email': api_user_active.email_address}
         response = client.get(url_for('main.two_factor'))
         assert response.status_code == 200
-        assert '''We’ve sent you a text message with a verification code.''' in response.get_data(as_text=True)
+        assert '''We’ve sent you a text message with a security code.''' in response.get_data(as_text=True)
 
 
 def test_should_login_user_and_redirect_to_service_dashboard(app_,

tests/app/main/views/test_verify.py

@@ -18,7 +18,7 @@ def test_should_return_verify_template(app_,
             page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
             assert page.h1.text == 'Check your phone'
             message = page.find_all('p')[1].text
-            assert message == "We’ve sent you a text message with a verification code."
+            assert message == "We’ve sent you a text message with a security code."
 
 
 def test_should_redirect_to_add_service_when_sms_code_is_correct(app_,