darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 21:49:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor add-service form such that the dao is not exposed in the forms.

Browse Source
This commit is contained in:
Rebecca Law
2016-01-04 15:31:50 +00:00
parent 75bafd7a7d
commit ac05f6931e
9 changed files with 57 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/app/main/dao/test_service_dao.py
View File

@@ -60,3 +60,15 @@ def test_should_not_allow_two_services_of_the_same_name(notifications_admin, not
with pytest.raises(sqlalchemy.exc.IntegrityError) as error:
services_dao.insert_new_service('duplicate service', user)
assert 'duplicate key value violates unique constraint "services_name_key' in error.value
def test_should_return_list_of_service_names(notifications_admin, notifications_admin_db, notify_db_session):
user = create_test_user('active')
services_dao.insert_new_service('first service', user)
services_dao.insert_new_service('second service', user)
services_dao.insert_new_service('third service', user)
expected = ['first service', 'second service', 'third service']
actual = services_dao.find_all_service_names()
assert actual == expected

18
tests/app/main/test_add_service_form.py
View File

@@ -1,18 +1,12 @@
from app.main.dao import services_dao
from app.main.forms import AddServiceForm
from tests.app.main import create_test_user
from werkzeug.datastructures import MultiDict
def test_form_should_have_errors_when_duplicate_service_is_added(notifications_admin,
notifications_admin_db,
notify_db_session):
with notifications_admin.test_request_context(method='POST',
data={'service_name': 'some service'}) as req:
user = create_test_user('active')
services_dao.insert_new_service('some service', user)
req.session['user_id'] = user.id
form = AddServiceForm(req.request.form)
assert form.validate() is False
assert len(form.errors) == 1
expected = {'service_name': ['Duplicate service name']}
assert form.errors == expected
with notifications_admin.test_request_context():
form = AddServiceForm(['some service', 'more names'],
formdata=MultiDict([('service_name', 'some service')]))
form.validate()
assert {'service_name': ['Service name already exists']} == form.errors

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

@@ -38,5 +38,5 @@ def test_should_return_form_errors_when_service_name_is_empty(notifications_admi
verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms')
client.post('/two-factor', data={'sms_code': '12345'})
response = client.post('/add-service', data={})
assert response.status_code == 400
assert response.status_code == 200
assert 'Please enter your service name' in response.get_data(as_text=True)