darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-11 10:28:41 -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
app/utils.py
+1 -1
View File
@@ -205,5 +205,5 @@ def get_help_argument():
def is_gov_user(email_address): def is_gov_user(email_address):
valid_domains = current_app.config['EMAIL_DOMAIN_REGEXES'] 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())) return bool(re.search(email_regex, email_address.lower()))
config.py
+17 -17
View File
@@ -44,23 +44,23 @@ class Config(object):
TEST_MESSAGE_FILENAME = 'Test message' TEST_MESSAGE_FILENAME = 'Test message'
EMAIL_DOMAIN_REGEXES = [ EMAIL_DOMAIN_REGEXES = [
"gov.uk", "gov\.uk",
"mod.uk", "mod\.uk",
"mil.uk", "mil\.uk",
"ddc-mod.org", "ddc-mod\.org",
"slc.co.uk", "slc\.co\.uk",
"gov.scot", "gov\.scot",
"parliament.uk", "parliament\.uk",
"nhs.uk", "nhs\.uk",
"nhs.net", "nhs\.net",
"police.uk", "police\.uk",
"kainos.com", "kainos\.com",
"salesforce.com", "salesforce\.com",
"bitzesty.com", "bitzesty\.com",
"dclgdatamart.co.uk", "dclgdatamart\.co\.uk",
"valtech.co.uk", "valtech\.co\.uk",
"cgi.com", "cgi\.com",
"capita.co.uk", "capita\.co\.uk",
"ucds.email" "ucds.email"
] ]
tests/app/main/views/test_add_service.py
+2 -4
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 assert not mock_create_service.called
def test_non_whitelist_user_cannot_access_create_service_page(app_, def test_non_whitelist_user_cannot_access_create_service_page(client,
client,
mock_login, mock_login,
mock_get_non_govuser, mock_get_non_govuser,
api_nongov_user_active): api_nongov_user_active):
@@ -115,8 +114,7 @@ def test_non_whitelist_user_cannot_access_create_service_page(app_,
assert response.status_code == 403 assert response.status_code == 403
def test_non_whitelist_user_cannot_create_service(app_, def test_non_whitelist_user_cannot_create_service(client,
client,
mock_login, mock_login,
mock_get_non_govuser, mock_get_non_govuser,
api_nongov_user_active): api_nongov_user_active):
tests/app/main/views/test_all_services.py
+1 -2
View File
@@ -30,8 +30,7 @@ def test_all_service_returns_403_when_not_a_platform_admin(app_,
assert response.status_code == 403 assert response.status_code == 403
def test_non_gov_user_cannot_see_add_service_button(app_, def test_non_gov_user_cannot_see_add_service_button(client,
client,
mock_login, mock_login,
mock_get_non_govuser, mock_get_non_govuser,
api_nongov_user_active): api_nongov_user_active):