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

Update regex/config and remove unused imports

Browse Source
This commit is contained in:
Imdad Ahad
2016-10-28 11:44:35 +01:00
parent a7e5285073
commit e58b63f504
4 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/utils.py
View File

@@ -205,5 +205,5 @@ def get_help_argument():
def is_gov_user(email_address):
valid_domains = current_app.config['EMAIL_DOMAIN_REGEXES']
email_regex = "[.|@]({})$".format("|".join(valid_domains))
email_regex = (r"[\.|@]({})$".format("|".join(valid_domains)))
return bool(re.search(email_regex, email_address.lower()))

34
config.py
View File

@@ -44,23 +44,23 @@ class Config(object):
TEST_MESSAGE_FILENAME = 'Test message'
EMAIL_DOMAIN_REGEXES = [
"gov.uk",
"mod.uk",
"mil.uk",
"ddc-mod.org",
"slc.co.uk",
"gov.scot",
"parliament.uk",
"nhs.uk",
"nhs.net",
"police.uk",
"kainos.com",
"salesforce.com",
"bitzesty.com",
"dclgdatamart.co.uk",
"valtech.co.uk",
"cgi.com",
"capita.co.uk",
"gov\.uk",
"mod\.uk",
"mil\.uk",
"ddc-mod\.org",
"slc\.co\.uk",
"gov\.scot",
"parliament\.uk",
"nhs\.uk",
"nhs\.net",
"police\.uk",
"kainos\.com",
"salesforce\.com",
"bitzesty\.com",
"dclgdatamart\.co\.uk",
"valtech\.co\.uk",
"cgi\.com",
"capita\.co\.uk",
"ucds.email"
]

6
tests/app/main/views/test_add_service.py
View File

@@ -104,8 +104,7 @@ def test_should_return_form_errors_with_duplicate_service_name_regardless_of_cas
assert not mock_create_service.called
def test_non_whitelist_user_cannot_access_create_service_page(app_,
client,
def test_non_whitelist_user_cannot_access_create_service_page(client,
mock_login,
mock_get_non_govuser,
api_nongov_user_active):
@@ -115,8 +114,7 @@ def test_non_whitelist_user_cannot_access_create_service_page(app_,
assert response.status_code == 403
def test_non_whitelist_user_cannot_create_service(app_,
client,
def test_non_whitelist_user_cannot_create_service(client,
mock_login,
mock_get_non_govuser,
api_nongov_user_active):

3
tests/app/main/views/test_all_services.py
View File

@@ -30,8 +30,7 @@ def test_all_service_returns_403_when_not_a_platform_admin(app_,
assert response.status_code == 403
def test_non_gov_user_cannot_see_add_service_button(app_,
client,
def test_non_gov_user_cannot_see_add_service_button(client,
mock_login,
mock_get_non_govuser,
api_nongov_user_active):