darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 10:53:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update email_from when the service name is changed.

Browse Source 
Update unit tests
Service name is uniqueness is not based on case.
This commit is contained in:
Rebecca Law
2016-03-30 17:12:00 +01:00
parent 9de80d685a
commit 677237ba47
7 changed files with 87 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/forms.py
View File

@@ -180,7 +180,7 @@ class ServiceNameForm(Form):
]) ])
def validate_name(self, a): def validate_name(self, a):
if a.data in self._names_func(): if a.data.lower() in self._names_func():
raise ValidationError('This service name is already in use') raise ValidationError('This service name is already in use')

9
app/main/views/service_settings.py
View File

@@ -15,7 +15,7 @@ from notifications_python_client import HTTPError
from app import service_api_client from app import service_api_client
from app.main import main from app.main import main
from app.utils import user_has_permissions from app.utils import user_has_permissions, email_safe
from app.main.forms import ConfirmPasswordForm, ServiceNameForm from app.main.forms import ConfirmPasswordForm, ServiceNameForm
from app import user_api_client from app import user_api_client
@@ -65,6 +65,7 @@ def service_name_change_confirm(service_id):
if form.validate_on_submit(): if form.validate_on_submit():
service['name'] = session['service_name_change'] service['name'] = session['service_name_change']
service['email_from'] = email_safe(session['service_name_change'])
try: try:
service_api_client.update_service( service_api_client.update_service(
service['id'], service['id'],
@@ -72,7 +73,8 @@ def service_name_change_confirm(service_id):
service['active'], service['active'],
service['limit'], service['limit'],
service['restricted'], service['restricted'],
service['users']) service['users'],
service['email_from'])
except HTTPError as e: except HTTPError as e:
error_msg = "Duplicate service name '{}'".format(session['service_name_change']) error_msg = "Duplicate service name '{}'".format(session['service_name_change'])
if e.status_code == 400 and error_msg in e.message['name']: if e.status_code == 400 and error_msg in e.message['name']:
@@ -144,7 +146,8 @@ def service_status_change_confirm(service_id):
service['active'], service['active'],
service['limit'], service['limit'],
service['restricted'], service['restricted'],
service['users']) service['users'],
service['email_from'])
return redirect(url_for('.service_settings', service_id=service_id)) return redirect(url_for('.service_settings', service_id=service_id))
return render_template( return render_template(
'views/service-settings/confirm.html', 'views/service-settings/confirm.html',

8
app/notify_client/api_client.py
View File

@@ -57,7 +57,8 @@ class ServiceAPIClient(NotificationsAPIClient):
active, active,
limit, limit,
restricted, restricted,
users): users,
email_from):
""" """
Update a service. Update a service.
""" """
@@ -67,7 +68,8 @@ class ServiceAPIClient(NotificationsAPIClient):
"active": active, "active": active,
"limit": limit, "limit": limit,
"restricted": restricted, "restricted": restricted,
"users": users "users": users,
"email_from": email_from
} }
endpoint = "/service/{0}".format(service_id) endpoint = "/service/{0}".format(service_id)
return self.post(endpoint, data) return self.post(endpoint, data)
@@ -142,7 +144,7 @@ class ServiceAPIClient(NotificationsAPIClient):
def find_all_service_names(self, user_id=None): def find_all_service_names(self, user_id=None):
resp = self.get_services(user_id) resp = self.get_services(user_id)
return [x['name'] for x in resp['data']] return [x['name'].lower() for x in resp['data']]
class ServicesBrowsableItem(BrowsableItem): class ServicesBrowsableItem(BrowsableItem):

6
app/utils.py
View File

@@ -101,3 +101,9 @@ def generate_previous_next_dict(view, view_dict, page, title, label):
'title': title, 'title': title,
'label': label 'label': label
} }
def email_safe(string):
return "".join([
character.lower() if character.isalnum() or character == "." else "" for character in re.sub("\s+", ".", string.strip()) # noqa
])

5
tests/__init__.py
View File

@@ -22,14 +22,15 @@ class TestClient(FlaskClient):
self.get(url_for("main.logout")) self.get(url_for("main.logout"))
def service_json(id_, name, users, limit=1000, active=False, restricted=True): def service_json(id_, name, users, limit=1000, active=False, restricted=True, email_from=None):
return { return {
'id': id_, 'id': id_,
'name': name, 'name': name,
'users': users, 'users': users,
'limit': limit, 'limit': limit,
'active': active, 'active': active,
'restricted': restricted 'restricted': restricted,
'email_from': email_from
} }

137
tests/app/main/views/test_service_settings.py
View File

@@ -1,82 +1,69 @@
from flask import url_for from flask import url_for
import app
from app.utils import email_safe
from tests import validate_route_permission from tests import validate_route_permission
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
def test_should_show_overview(app_, def test_should_show_overview(app_,
api_user_active, active_user_with_permissions,
mock_get_service, mocker,
mock_get_user, service_one):
mock_get_user_by_email,
mock_login,
mock_has_permissions):
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(active_user_with_permissions, mocker, service_one)
service_id = 123
response = client.get(url_for( response = client.get(url_for(
'main.service_settings', service_id=service_id)) 'main.service_settings', service_id=service_one['id']))
assert response.status_code == 200 assert response.status_code == 200
resp_data = response.get_data(as_text=True) resp_data = response.get_data(as_text=True)
assert 'Service settings' in resp_data assert 'Service settings' in resp_data
service = mock_get_service.side_effect(service_id)['data'] app.service_api_client.get_service.assert_called_with(service_one['id'])
assert mock_get_service.called
def test_should_show_service_name(app_, def test_should_show_service_name(app_,
api_user_active, active_user_with_permissions,
mock_get_service, mocker,
mock_get_user, service_one):
mock_get_user_by_email,
mock_login,
mock_has_permissions):
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(active_user_with_permissions, mocker, service_one)
service_id = 123
response = client.get(url_for( response = client.get(url_for(
'main.service_name_change', service_id=service_id)) 'main.service_name_change', service_id=service_one['id']))
assert response.status_code == 200 assert response.status_code == 200
resp_data = response.get_data(as_text=True) resp_data = response.get_data(as_text=True)
assert 'Change your service name' in resp_data assert 'Change your service name' in resp_data
assert mock_get_service.called app.service_api_client.get_service.assert_called_with(service_one['id'])
service = mock_get_service.side_effect(service_id)['data']
def test_should_redirect_after_change_service_name(app_, def test_should_redirect_after_change_service_name(app_,
api_user_active, active_user_with_permissions,
mock_get_service, service_one,
mock_get_user, mocker,
mock_get_user_by_email, mock_get_services):
mock_login,
mock_has_permissions):
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(active_user_with_permissions, mocker, service_one)
service_id = 123
response = client.post( response = client.post(
url_for('main.service_name_change', service_id=service_id), url_for('main.service_name_change', service_id=service_one['id']),
data={'name': "new name"}) data={'name': "new name"})
assert response.status_code == 302 assert response.status_code == 302
settings_url = url_for( settings_url = url_for(
'main.service_name_change_confirm', service_id=service_id, _external=True) 'main.service_name_change_confirm', service_id=service_one['id'], _external=True)
assert settings_url == response.location assert settings_url == response.location
assert mock_get_service.called assert mock_get_services.called
def test_should_not_allow_duplicate_names(app_, def test_should_not_allow_duplicate_names(app_,
api_user_active, active_user_with_permissions,
mock_get_service, mocker,
mock_get_user, service_one,
mock_get_user_by_email,
mock_login,
mock_has_permissions,
mock_get_services): mock_get_services):
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(active_user_with_permissions, mocker, service_one)
service_id = 123 service_id = service_one['id']
response = client.post( response = client.post(
url_for('main.service_name_change', service_id=service_id), url_for('main.service_name_change', service_id=service_id),
data={'name': "service_one"}) data={'name': "service_one"})
@@ -87,38 +74,32 @@ def test_should_not_allow_duplicate_names(app_,
def test_should_show_service_name_confirmation(app_, def test_should_show_service_name_confirmation(app_,
api_user_active, active_user_with_permissions,
mock_get_service, mocker,
mock_get_user, service_one):
mock_get_user_by_email,
mock_login,
mock_has_permissions):
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(active_user_with_permissions, mocker, service_one)
service_id = 123
response = client.get(url_for( response = client.get(url_for(
'main.service_name_change_confirm', service_id=service_id)) 'main.service_name_change_confirm', service_id=service_one['id']))
assert response.status_code == 200 assert response.status_code == 200
resp_data = response.get_data(as_text=True) resp_data = response.get_data(as_text=True)
assert 'Change your service name' in resp_data assert 'Change your service name' in resp_data
assert mock_get_service.called app.service_api_client.get_service.assert_called_with(service_one['id'])
def test_should_redirect_after_service_name_confirmation(app_, def test_should_redirect_after_service_name_confirmation(app_,
api_user_active, active_user_with_permissions,
mock_get_service, service_one,
mocker,
mock_update_service, mock_update_service,
mock_get_user, mock_verify_password):
mock_get_user_by_email,
mock_login,
mock_verify_password,
mock_has_permissions):
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(active_user_with_permissions, mocker, service_one)
service_id = 123 service_id = service_one['id']
service_new_name = 'New Name' service_new_name = 'New Name'
with client.session_transaction() as session: with client.session_transaction() as session:
session['service_name_change'] = service_new_name session['service_name_change'] = service_new_name
@@ -126,38 +107,40 @@ def test_should_redirect_after_service_name_confirmation(app_,
'main.service_name_change_confirm', service_id=service_id)) 'main.service_name_change_confirm', service_id=service_id))
assert response.status_code == 302 assert response.status_code == 302
settings_url = url_for( settings_url = url_for('main.service_settings', service_id=service_id, _external=True)
'main.service_settings', service_id=service_id, _external=True)
resp_data = response.get_data(as_text=True)
assert settings_url == response.location assert settings_url == response.location
assert mock_get_service.called mock_update_service.assert_called_once_with(service_id,
assert mock_update_service.called service_new_name,
service_one['active'],
service_one['limit'],
service_one['restricted'],
service_one['users'],
email_safe(service_new_name))
assert mock_verify_password.called
def test_should_raise_duplicate_name_handled(app_, def test_should_raise_duplicate_name_handled(app_,
api_user_active, active_user_with_permissions,
mock_get_service, service_one,
mocker,
mock_get_services,
mock_update_service_raise_httperror_duplicate_name, mock_update_service_raise_httperror_duplicate_name,
mock_get_user, mock_verify_password):
mock_get_user_by_email,
mock_login,
mock_verify_password,
mock_has_permissions):
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(active_user_with_permissions, mocker, service_one)
service_id = 123
service_new_name = 'New Name' service_new_name = 'New Name'
with client.session_transaction() as session: with client.session_transaction() as session:
session['service_name_change'] = service_new_name session['service_name_change'] = service_new_name
response = client.post(url_for( response = client.post(url_for(
'main.service_name_change_confirm', service_id=service_id)) 'main.service_name_change_confirm', service_id=service_one['id']))
assert response.status_code == 302 assert response.status_code == 302
name_change_url = url_for( name_change_url = url_for(
'main.service_name_change', service_id=service_id, _external=True) 'main.service_name_change', service_id=service_one['id'], _external=True)
resp_data = response.get_data(as_text=True)
assert name_change_url == response.location assert name_change_url == response.location
assert mock_update_service_raise_httperror_duplicate_name.called
assert mock_verify_password.called
def test_should_show_request_to_go_live(app_, def test_should_show_request_to_go_live(app_,

10
tests/conftest.py
View File

@@ -77,14 +77,15 @@ def mock_update_service(mocker):
active, active,
limit, limit,
restricted, restricted,
users): users,
email_from):
service = service_json( service = service_json(
service_id, service_name, users, limit=limit, service_id, service_name, users, limit=limit,
active=active, restricted=restricted) active=active, restricted=restricted, email_from=email_from)
return {'data': service} return {'data': service}
return mocker.patch( return mocker.patch(
'app.service_api_client.update_service', side_effect=_update) 'app.service_api_client.update_service', side_effect=_update, autospec=True)
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
@@ -94,7 +95,8 @@ def mock_update_service_raise_httperror_duplicate_name(mocker):
active, active,
limit, limit,
restricted, restricted,
users): users,
email_from):
json_mock = Mock(return_value={'message': {'name': ["Duplicate service name '{}'".format(service_name)]}}) json_mock = Mock(return_value={'message': {'name': ["Duplicate service name '{}'".format(service_name)]}})
resp_mock = Mock(status_code=400, json=json_mock) resp_mock = Mock(status_code=400, json=json_mock)
http_error = HTTPError(response=resp_mock, message="Default message") http_error = HTTPError(response=resp_mock, message="Default message")