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

Added current_service to flask context and template context.

Browse Source 
Fix all tests and conflicts.

Removed comment line.
This commit is contained in:
Nicholas Staples
2016-04-04 16:53:52 +01:00
parent f444284580
commit c31c55666b
37 changed files with 207 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/app/main/views/test_accept_invite.py
View File

@@ -13,6 +13,7 @@ def test_existing_user_accept_invite_calls_api_and_redirects_to_dashboard(app_,
service_one,
api_user_active,
sample_invite,
mock_get_service,
mock_check_invite_token,
mock_get_user_by_email,
mock_get_users_by_service,
@@ -43,7 +44,8 @@ def test_existing_user_with_no_permissions_accept_invite(app_,
mock_check_invite_token,
mock_get_user_by_email,
mock_get_users_by_service,
mock_add_user_to_service):
mock_add_user_to_service,
mock_get_service):
expected_service = service_one['id']
sample_invite['permissions'] = ''
@@ -61,7 +63,8 @@ def test_existing_user_with_no_permissions_accept_invite(app_,
def test_if_existing_user_accepts_twice_they_redirect_to_sign_in(app_,
mocker,
sample_invite):
sample_invite,
mock_get_service):
sample_invite['status'] = 'accepted'
invite = InvitedUser(**sample_invite)
@@ -82,6 +85,7 @@ def test_existing_user_of_service_get_redirected_to_signin(app_,
mocker,
api_user_active,
sample_invite,
mock_get_service,
mock_get_user_by_email,
mock_accept_invite):
sample_invite['email_address'] = api_user_active.email_address
@@ -109,7 +113,8 @@ def test_existing_signed_out_user_accept_invite_redirects_to_sign_in(app_,
mock_get_user_by_email,
mock_get_users_by_service,
mock_add_user_to_service,
mock_accept_invite):
mock_accept_invite,
mock_get_service):
expected_service = service_one['id']
expected_permissions = ['send_messages', 'manage_service', 'manage_api_keys']
@@ -136,7 +141,8 @@ def test_new_user_accept_invite_calls_api_and_redirects_to_registration(app_,
mock_check_invite_token,
mock_dont_get_user_by_email,
mock_add_user_to_service,
mock_get_users_by_service):
mock_get_users_by_service,
mock_get_service):
expected_redirect_location = 'http://localhost/register-from-invite'
@@ -157,7 +163,8 @@ def test_new_user_accept_invite_calls_api_and_views_registration_page(app_,
mock_check_invite_token,
mock_dont_get_user_by_email,
mock_add_user_to_service,
mock_get_users_by_service):
mock_get_users_by_service,
mock_get_service):
with app_.test_request_context():
with app_.test_client() as client:
@@ -215,7 +222,8 @@ def test_new_user_accept_invite_completes_new_registration_redirects_to_verify(a
mock_register_user,
mock_send_verify_code,
mock_get_users_by_service,
mock_add_user_to_service):
mock_add_user_to_service,
mock_get_service):
expected_service = service_one['id']
expected_email = sample_invite['email_address']
@@ -261,7 +269,8 @@ def test_signed_in_existing_user_cannot_use_anothers_invite(app_,
api_user_active,
sample_invite,
mock_get_user,
mock_accept_invite):
mock_accept_invite,
mock_get_service):
invite = InvitedUser(**sample_invite)
mocker.patch('app.invite_api_client.check_token', return_value=invite)
mocker.patch('app.user_api_client.get_users_for_service', return_value=[api_user_active])
@@ -287,7 +296,8 @@ def test_signed_out_existing_user_cannot_use_anothers_invite(app_,
mock_get_user_by_email,
mock_verify_password,
mock_send_verify_code,
mock_accept_invite):
mock_accept_invite,
mock_get_service):
invite = InvitedUser(**sample_invite)
mocker.patch('app.invite_api_client.check_token', return_value=invite)
mocker.patch('app.user_api_client.get_users_for_service', return_value=[api_user_active])

33
tests/app/main/views/test_api_keys.py
View File

@@ -6,9 +6,10 @@ from tests import validate_route_permission
def test_should_show_api_keys_and_documentation_page(app_,
api_user_active,
mock_login,
mock_get_user,
mock_get_user_by_email,
mock_login):
mock_get_service):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
@@ -20,9 +21,10 @@ def test_should_show_api_keys_and_documentation_page(app_,
def test_should_show_empty_api_keys_page(app_,
api_user_active,
mock_get_user,
mock_login,
mock_get_user_by_email,
mock_get_no_api_keys,
mock_login,
mock_get_service,
mock_has_permissions):
with app_.test_request_context():
with app_.test_client() as client:
@@ -38,10 +40,11 @@ def test_should_show_empty_api_keys_page(app_,
def test_should_show_api_keys_page(app_,
api_user_active,
mock_login,
mock_get_user,
mock_get_user_by_email,
mock_get_api_keys,
mock_login,
mock_get_service,
mock_has_permissions):
with app_.test_request_context():
with app_.test_client() as client:
@@ -58,10 +61,11 @@ def test_should_show_api_keys_page(app_,
def test_should_show_name_api_key_page(app_,
api_user_active,
mock_login,
mock_get_user,
mock_get_user_by_email,
mock_get_api_keys,
mock_login,
mock_get_service,
mock_has_permissions):
with app_.test_request_context():
with app_.test_client() as client:
@@ -74,11 +78,12 @@ def test_should_show_name_api_key_page(app_,
def test_should_render_show_api_key(app_,
api_user_active,
mock_login,
mock_get_user,
mock_get_user_by_email,
mock_create_api_key,
mock_get_api_keys,
mock_login,
mock_get_service,
mock_has_permissions):
with app_.test_request_context():
with app_.test_client() as client:
@@ -94,10 +99,11 @@ def test_should_render_show_api_key(app_,
def test_should_show_confirm_revoke_api_key(app_,
api_user_active,
mock_login,
mock_get_user,
mock_get_user_by_email,
mock_get_api_keys,
mock_login,
mock_get_service,
mock_has_permissions):
with app_.test_request_context():
with app_.test_client() as client:
@@ -112,11 +118,12 @@ def test_should_show_confirm_revoke_api_key(app_,
def test_should_redirect_after_revoking_api_key(app_,
api_user_active,
mock_login,
mock_get_user,
mock_get_user_by_email,
mock_revoke_api_key,
mock_get_api_keys,
mock_login,
mock_get_service,
mock_has_permissions):
with app_.test_request_context():
with app_.test_client() as client:
@@ -130,7 +137,11 @@ def test_should_redirect_after_revoking_api_key(app_,
mock_get_api_keys.assert_called_once_with(service_id=service_id, key_id=321)
def test_route_permissions(mocker, app_, api_user_active, service_one, mock_get_api_keys):
def test_route_permissions(mocker,
app_,
api_user_active,
service_one,
mock_get_api_keys):
routes = [
'main.api_keys',
'main.create_api_key',
@@ -148,7 +159,11 @@ def test_route_permissions(mocker, app_, api_user_active, service_one, mock_get_
service_one)
def test_route_invalid_permissions(mocker, app_, api_user_active, service_one, mock_get_api_keys):
def test_route_invalid_permissions(mocker,
app_,
api_user_active,
service_one,
mock_get_api_keys):
routes = [
'main.api_keys',
'main.create_api_key',

1
tests/app/main/views/test_jobs.py
View File

@@ -9,6 +9,7 @@ def test_should_return_list_of_all_jobs(app_,
mock_get_user,
mock_get_user_by_email,
mock_login,
mock_get_service,
mock_get_jobs,
mock_has_permissions):
with app_.test_request_context():

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

@@ -283,10 +283,10 @@ def test_should_redirect_after_status_confirmation(app_,
def test_should_show_delete_page(app_,
api_user_active,
mock_login,
mock_get_service,
mock_get_user,
mock_get_user_by_email,
mock_login,
mock_has_permissions):
with app_.test_request_context():
with app_.test_client() as client:

12
tests/app/main/views/test_templates.py
View File

@@ -7,10 +7,11 @@ from flask import url_for
def test_should_show_page_for_one_templates(app_,
api_user_active,
mock_login,
mock_get_service,
mock_get_service_template,
mock_get_user,
mock_get_user_by_email,
mock_login,
mock_has_permissions):
with app_.test_request_context():
with app_.test_client() as client:
@@ -31,11 +32,12 @@ def test_should_show_page_for_one_templates(app_,
def test_should_redirect_when_saving_a_template(app_,
api_user_active,
mock_login,
mock_get_service_template,
mock_update_service_template,
mock_get_user,
mock_get_service,
mock_get_user_by_email,
mock_login,
mock_has_permissions):
with app_.test_request_context():
with app_.test_client() as client:
@@ -65,10 +67,11 @@ def test_should_redirect_when_saving_a_template(app_,
def test_should_show_delete_template_page(app_,
api_user_active,
mock_login,
mock_get_service,
mock_get_service_template,
mock_get_user,
mock_get_user_by_email,
mock_login,
mock_has_permissions):
with app_.test_request_context():
with app_.test_client() as client:
@@ -91,11 +94,12 @@ def test_should_show_delete_template_page(app_,
def test_should_redirect_when_deleting_a_template(app_,
api_user_active,
mock_login,
mock_get_service,
mock_get_service_template,
mock_delete_service_template,
mock_get_user,
mock_get_user_by_email,
mock_login,
mock_has_permissions):
with app_.test_request_context():
with app_.test_client() as client:

1
tests/app/main/views/test_tour.py
View File

@@ -9,6 +9,7 @@ def test_should_render_tour_pages(
app_,
api_user_active,
mocker,
mock_get_service,
page
):
with app_.test_request_context():