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

Working service integration.

Browse Source
This commit is contained in:
Nicholas Staples
2016-01-18 17:35:28 +00:00
parent 6e19dd7c9c
commit 609f5f0a8d
11 changed files with 147 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,9 +16,8 @@ def test_can_insert_new_service(db_,
def test_unrestrict_service_updates_the_service(db_,
db_session,
mock_get_service,
mock_update_service,
service_one):
mock_get_service.return_value = {'data': service_one}
mock_update_service):
service_one = mock_get_service.side_effect(123)['data']
services_dao.unrestrict_service(service_one['id'])
mock_update_service.assert_called_once_with(service_one['id'],
service_one['name'],
@@ -30,10 +29,10 @@ def test_unrestrict_service_updates_the_service(db_,
def test_activate_service_update_service(db_,
db_session,
active_user,
mock_get_service,
mock_update_service,
service_one):
mock_get_service.return_value = {'data': service_one}
mock_update_service):
service_one = mock_get_service.side_effect(123)['data']
services_dao.activate_service(service_one['id'])
mock_update_service.assert_called_once_with(service_one['id'],
service_one['name'],
@@ -44,7 +43,7 @@ def test_activate_service_update_service(db_,
def test_get_service_returns_none_if_service_does_not_exist(db_, db_session, mock_get_service):
mock_get_service.return_value = None
mock_get_service.side_effect = lambda x: None
service = services_dao.get_service_by_id(1)
assert service is None

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

@@ -9,6 +9,6 @@ def test_form_should_have_errors_when_duplicate_service_is_added(app_,
return ['some service', 'more names']
with app_.test_request_context():
form = AddServiceForm(_get_form_names,
formdata=MultiDict([('service_name', 'some service')]))
formdata=MultiDict([('name', 'some service')]))
form.validate()
assert {'service_name': ['Service name already exists']} == form.errors
assert {'name': ['Service name already exists']} == form.errors

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

@@ -4,11 +4,10 @@ from tests import create_test_user
from app.models import User
def test_get_should_render_add_service_template(app_, db_, db_session, mock_get_service):
def test_get_should_render_add_service_template(app_, db_, db_session, active_user, mock_get_service):
with app_.test_request_context():
with app_.test_client() as client:
user = create_test_user('active')
client.login(user)
client.login(active_user)
response = client.get(url_for('main.add_service'))
assert response.status_code == 200
assert 'Set up notifications for your service' in response.get_data(as_text=True)
@@ -25,7 +24,7 @@ def test_should_add_service_and_redirect_to_next_page(app_,
client.login(user)
response = client.post(
url_for('main.add_service'),
data={'service_name': 'testing the post'})
data={'name': 'testing the post'})
assert response.status_code == 302
assert response.location == url_for('main.service_dashboard', service_id=101, _external=True)
assert mock_create_service.called
@@ -54,7 +53,7 @@ def test_should_return_form_errors_with_duplicate_service_name(app_,
user = User.query.first()
client.login(user)
response = client.post(
url_for('main.add_service'), data={'service_name': 'service_one'})
url_for('main.add_service'), data={'name': 'service_one'})
assert response.status_code == 200
assert 'Service name already exists' in response.get_data(as_text=True)
assert mock_get_services.called

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

@@ -1,4 +1,4 @@
from flask import url_for
from flask import (url_for, session)
def test_should_show_overview(app_, db_, db_session, active_user, mock_get_service):
@@ -28,7 +28,6 @@ def test_should_show_service_name(app_, db_, db_session, active_user, mock_get_s
assert 'Change your service name' in resp_data
assert mock_get_service.called
service = mock_get_service.side_effect(service_id)['data']
assert service['name'] in resp_data
def test_should_redirect_after_change_service_name(app_, db_, db_session, active_user, mock_get_service):
@@ -39,14 +38,18 @@ def test_should_redirect_after_change_service_name(app_, db_, db_session, active
response = client.post(url_for(
'main.service_name_change', service_id=service_id))
assert response.status_code == 302
settings_url = url_for(
'main.service_settings', service_id=service_id, _external=True)
assert settings_url == response.location
assert mock_get_service.called
assert response.status_code == 302
settings_url = url_for(
'main.service_name_change_confirm', service_id=service_id, _external=True)
assert settings_url == response.location
assert mock_get_service.called
def test_should_show_service_name_confirmation(app_, db_, db_session, active_user, mock_get_service):
def test_should_show_service_name_confirmation(app_,
db_,
db_session,
active_user,
mock_get_service):
with app_.test_request_context():
with app_.test_client() as client:
client.login(active_user)
@@ -54,29 +57,35 @@ def test_should_show_service_name_confirmation(app_, db_, db_session, active_use
response = client.get(url_for(
'main.service_name_change_confirm', service_id=service_id))
assert response.status_code == 200
resp_data = response.get_data(as_text=True)
assert 'Change your service name' in resp_data
assert mock_get_service.called
assert response.status_code == 200
resp_data = response.get_data(as_text=True)
assert 'Change your service name' in resp_data
assert mock_get_service.called
def test_should_redirect_after_service_name_confirmation(app_,
db_,
db_session,
active_user,
mock_get_service):
mock_get_service,
mock_update_service):
with app_.test_request_context():
with app_.test_client() as client:
client.login(active_user)
service_id = 123
service_new_name = 'New Name'
with client.session_transaction() as session:
session['service_name_change'] = service_new_name
response = client.post(url_for(
'main.service_name_change_confirm', service_id=service_id))
assert response.status_code == 302
settings_url = url_for(
'main.service_settings', service_id=service_id, _external=True)
assert settings_url == response.location
assert mock_get_service.called
assert response.status_code == 302
settings_url = url_for(
'main.service_settings', service_id=service_id, _external=True)
resp_data = response.get_data(as_text=True)
assert settings_url == response.location
assert mock_get_service.called
assert mock_update_service.called
def test_should_show_request_to_go_live(app_, db_, db_session, active_user, mock_get_service):
@@ -86,19 +95,19 @@ def test_should_show_request_to_go_live(app_, db_, db_session, active_user, mock
service_id = 123
response = client.get(
url_for('main.service_request_to_go_live', service_id=service_id))
service = mock_get_service.side_effect(service_id)['data']
assert response.status_code == 200
resp_data = response.get_data(as_text=True)
assert 'Request to go live' in resp_data
assert mock_get_service.called
assert service['name'] in resp_data
service = mock_get_service.side_effect(service_id)['data']
assert response.status_code == 200
resp_data = response.get_data(as_text=True)
assert 'Request to go live' in resp_data
assert mock_get_service.called
def test_should_redirect_after_request_to_go_live(app_,
db_,
db_session,
active_user,
mock_get_service):
mock_get_service,
mock_update_service):
with app_.test_request_context():
with app_.test_client() as client:
client.login(active_user)
@@ -106,11 +115,12 @@ def test_should_redirect_after_request_to_go_live(app_,
response = client.post(url_for(
'main.service_request_to_go_live', service_id=service_id))
assert response.status_code == 302
settings_url = url_for(
'main.service_settings', service_id=service_id, _external=True)
assert settings_url == response.location
assert mock_get_service.called
assert response.status_code == 302
settings_url = url_for(
'main.service_settings', service_id=service_id, _external=True)
assert settings_url == response.location
assert mock_get_service.called
assert mock_update_service.called
def test_should_show_status_page(app_, db_, db_session, active_user, mock_get_service):
@@ -121,13 +131,17 @@ def test_should_show_status_page(app_, db_, db_session, active_user, mock_get_se
response = client.get(url_for(
'main.service_status_change', service_id=service_id))
assert response.status_code == 200
resp_data = response.get_data(as_text=True)
assert 'Turn off all outgoing notifications' in resp_data
assert mock_get_service.called
assert response.status_code == 200
resp_data = response.get_data(as_text=True)
assert 'Turn off all outgoing notifications' in resp_data
assert mock_get_service.called
def test_should_show_redirect_after_status_change(app_, db_, db_session, active_user, mock_get_service):
def test_should_show_redirect_after_status_change(app_,
db_,
db_session,
active_user,
mock_get_service):
with app_.test_request_context():
with app_.test_client() as client:
client.login(active_user)
@@ -135,10 +149,11 @@ def test_should_show_redirect_after_status_change(app_, db_, db_session, active_
response = client.post(url_for(
'main.service_status_change', service_id=service_id))
assert response.status_code == 302
redirect_url = url_for(
'main.service_status_change_confirm', service_id=service_id)
assert redirect_url == response.location
assert response.status_code == 302
redirect_url = url_for(
'main.service_status_change_confirm', service_id=service_id, _external=True)
assert redirect_url == response.location
assert mock_get_service.called
def test_should_show_status_confirmation(app_, db_, db_session, active_user, mock_get_service):
@@ -149,13 +164,18 @@ def test_should_show_status_confirmation(app_, db_, db_session, active_user, moc
response = client.get(url_for(
'main.service_status_change_confirm', service_id=service_id))
assert response.status_code == 200
resp_data = response.get_data(as_text=True)
assert 'Turn off all outgoing notifications' in resp_data
assert mock_get_service.called
assert response.status_code == 200
resp_data = response.get_data(as_text=True)
assert 'Turn off all outgoing notifications' in resp_data
assert mock_get_service.called
def test_should_redirect_after_status_confirmation(app_, db_, db_session, active_user, mock_get_service):
def test_should_redirect_after_status_confirmation(app_,
db_,
db_session,
active_user,
mock_get_service,
mock_update_service):
with app_.test_request_context():
with app_.test_client() as client:
client.login(active_user)
@@ -163,10 +183,12 @@ def test_should_redirect_after_status_confirmation(app_, db_, db_session, active
response = client.post(url_for(
'main.service_status_change_confirm', service_id=service_id))
assert response.status_code == 302
settings_url = url_for(
'main.service_settings', service_id=service_id, _external=True)
assert settings_url == response.location
assert response.status_code == 302
settings_url = url_for(
'main.service_settings', service_id=service_id, _external=True)
assert settings_url == response.location
assert mock_get_service.called
assert mock_update_service.called
def test_should_show_delete_page(app_, db_, db_session, active_user, mock_get_service):
@@ -177,9 +199,9 @@ def test_should_show_delete_page(app_, db_, db_session, active_user, mock_get_se
response = client.get(url_for(
'main.service_delete', service_id=service_id))
assert response.status_code == 200
assert 'Delete this service from Notify' in response.get_data(as_text=True)
assert mock_get_service.called
assert response.status_code == 200
assert 'Delete this service from Notify' in response.get_data(as_text=True)
assert mock_get_service.called
def test_should_show_redirect_after_deleting_service(app_, db_, db_session, active_user, mock_get_service):
@@ -190,10 +212,10 @@ def test_should_show_redirect_after_deleting_service(app_, db_, db_session, acti
response = client.post(url_for(
'main.service_delete', service_id=service_id))
assert response.status_code == 302
delete_url = url_for(
'main.service_delete_confirm', service_id=service_id)
assert delete_url == response.location
assert response.status_code == 302
delete_url = url_for(
'main.service_delete_confirm', service_id=service_id, _external=True)
assert delete_url == response.location
def test_should_show_delete_confirmation(app_, db_, db_session, active_user, mock_get_service):
@@ -204,9 +226,9 @@ def test_should_show_delete_confirmation(app_, db_, db_session, active_user, moc
response = client.get(url_for(
'main.service_delete_confirm', service_id=service_id))
assert response.status_code == 200
assert 'Delete this service from Notify' in response.get_data(as_text=True)
assert mock_get_service.called
assert response.status_code == 200
assert 'Delete this service from Notify' in response.get_data(as_text=True)
assert mock_get_service.called
def test_should_redirect_delete_confirmation(app_,
@@ -222,9 +244,9 @@ def test_should_redirect_delete_confirmation(app_,
response = client.post(url_for(
'main.service_delete_confirm', service_id=service_id))
assert response.status_code == 302
choose_url = url_for(
'main.choose_service', _external=True)
assert choose_url == response.location
assert mock_get_service.called
assert mock_delete_service.called
assert response.status_code == 302
choose_url = url_for(
'main.choose_service', _external=True)
assert choose_url == response.location
assert mock_get_service.called
assert mock_delete_service.called