Merge branch 'master' into platform-admin

Conflicts:
	app/main/views/send.py

tests/app/main/test_validators.py

@@ -6,8 +6,43 @@ def test_should_raise_validation_error_for_password(app_, mock_get_user_by_email
     form = RegisterUserForm()
     form.name.data = 'test'
     form.email_address.data = 'teset@example.gov.uk'
-    form.mobile_number.data = '+441231231231'
+    form.mobile_number.data = '441231231231'
     form.password.data = 'password1234'
 
     form.validate()
     assert 'That password is blacklisted, too common' in form.errors['password']
+
+
+def test_valid_email_not_in_valid_domains(app_):
+    with app_.test_request_context():
+        form = RegisterUserForm(email_address="test@test.com", mobile_number='441231231231')
+        assert not form.validate()
+        assert "Enter a central government email address" in form.errors['email_address'][0]
+
+
+def test_valid_email_in_valid_domains(app_):
+    with app_.test_request_context():
+        form = RegisterUserForm(
+            name="test",
+            email_address="test@my.gov.uk",
+            mobile_number='4407888999111',
+            password='1234567890')
+        form.validate()
+        assert form.errors == {}
+
+
+def test_invalid_email_address_error_message(app_):
+    with app_.test_request_context():
+        form = RegisterUserForm(
+            name="test",
+            email_address="test.com",
+            mobile_number='4407888999111',
+            password='1234567890')
+        assert not form.validate()
+
+        form = RegisterUserForm(
+            name="test",
+            email_address="test.com",
+            mobile_number='4407888999111',
+            password='1234567890')
+        assert not form.validate()

tests/app/main/views/test_dashboard.py

@@ -101,11 +101,11 @@ def test_menu_manage_api_keys(mocker, app_, api_user_active, service_one, mock_g
         assert url_for(
             'main.choose_template',
             service_id=service_one['id'],
-            template_type='email') not in page
+            template_type='email') in page
         assert url_for(
             'main.choose_template',
             service_id=service_one['id'],
-            template_type='sms') not in page
+            template_type='sms') in page
 
         assert url_for('main.manage_users', service_id=service_one['id']) not in page
         assert url_for('main.service_settings', service_id=service_one['id']) not in page

tests/app/main/views/test_headers.py

@@ -6,4 +6,4 @@ def test_owasp_useful_headers_set(app_):
     assert response.headers['X-Frame-Options'] == 'deny'
     assert response.headers['X-Content-Type-Options'] == 'nosniff'
     assert response.headers['X-XSS-Protection'] == '1; mode=block'
-    assert response.headers['Content-Security-Policy'] == "default-src 'self' 'unsafe-inline'; font-src 'self' data:; img-src 'self' data:;"  # noqa
+    assert response.headers['Content-Security-Policy'] == "default-src 'self' 'unsafe-inline'; script-src 'self' *.google-analytics.com 'unsafe-inline' data:; object-src 'self'; font-src 'self' data:; img-src 'self' *.google-analytics.com data:;"  # noqa

tests/app/main/views/test_register.py

@@ -82,7 +82,8 @@ def test_should_return_200_when_email_is_not_gov_uk(app_,
                                                  'password': 'validPassword!'})
 
     assert response.status_code == 200
-    assert 'Enter a gov.uk email address' in response.get_data(as_text=True)
+    print(response.get_data(as_text=True))
+    assert 'Enter a central government email address' in response.get_data(as_text=True)
 
 
 def test_should_add_user_details_to_session(app_,

tests/app/main/views/test_send.py

@@ -423,3 +423,41 @@ def test_route_choose_template_send_messages_permissions(mocker,
             "main.edit_service_template",
             service_id=service_one['id'],
             template_id=template_id) not in page
+
+
+def test_route_choose_template_manage_api_keys_permissions(mocker,
+                                                           app_,
+                                                           api_user_active,
+                                                           service_one,
+                                                           mock_get_user,
+                                                           mock_get_service,
+                                                           mock_check_verify_code,
+                                                           mock_get_service_templates,
+                                                           mock_get_jobs):
+    with app_.test_request_context():
+        template_id = mock_get_service_templates(service_one['id'])['data'][0]['id']
+        resp = validate_route_permission(
+            mocker,
+            app_,
+            "GET",
+            200,
+            url_for(
+                'main.choose_template',
+                service_id=service_one['id'],
+                template_type='sms'),
+            ['manage_api_keys', 'access_developer_docs'],
+            api_user_active,
+            service_one)
+        page = resp.get_data(as_text=True)
+        assert url_for(
+            "main.send_messages",
+            service_id=service_one['id'],
+            template_id=template_id) in page
+        assert url_for(
+            "main.send_message_to_self",
+            service_id=service_one['id'],
+            template_id=template_id) not in page
+        assert url_for(
+            "main.edit_service_template",
+            service_id=service_one['id'],
+            template_id=template_id) not in page