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

Merge branch 'master' into platform-admin

Browse Source 
Conflicts:
	tests/app/main/views/test_dashboard.py
This commit is contained in:
Rebecca Law
2016-03-21 13:23:46 +00:00
parent a1ef676fab 304b411bd5
commit 8ab4a5b150
10 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/app/main/views/test_code_not_received.py
View File

@@ -97,10 +97,10 @@ def test_should_render_verification_code_not_received(app_,
'speak to your service manager to reset the number.' in response.get_data(as_text=True)
def test_check_and_redirect_to_two_factor(app_,
api_user_active,
mock_get_user_by_email,
mock_send_verify_code):
def test_check_and_redirect_to_two_factor_if_user_active(app_,
api_user_active,
mock_get_user_by_email,
mock_send_verify_code):
with app_.test_request_context():
with app_.test_client() as client:
with client.session_transaction() as session:
@@ -112,6 +112,25 @@ def test_check_and_redirect_to_two_factor(app_,
assert response.location == url_for('main.two_factor', _external=True)
def test_check_and_redirect_to_verify_if_user_pending(app_,
mocker,
api_user_pending,
mock_get_user_pending,
mock_send_verify_code):
mocker.patch('app.user_api_client.get_user_by_email', return_value=api_user_pending)
with app_.test_request_context():
with app_.test_client() as client:
with client.session_transaction() as session:
session['user_details'] = {
'id': api_user_pending.id,
'email': api_user_pending.email_address}
response = client.get(url_for('main.check_and_resend_verification_code'))
assert response.status_code == 302
assert response.location == url_for('main.verify', _external=True)
def test_should_create_new_code_for_user(app_,
api_user_active,
mock_get_user_by_email,

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

@@ -86,7 +86,6 @@ def test_menu_manage_service(mocker, app_, api_user_active, service_one, mock_ge
assert url_for('main.service_settings', service_id=service_one['id']) in page
assert url_for('main.api_keys', service_id=service_one['id']) not in page
assert url_for('main.documentation', service_id=service_one['id']) not in page
def test_menu_manage_api_keys(mocker, app_, api_user_active, service_one, mock_get_service_templates, mock_get_jobs):
@@ -111,7 +110,6 @@ def test_menu_manage_api_keys(mocker, app_, api_user_active, service_one, mock_g
assert url_for('main.service_settings', service_id=service_one['id']) not in page
assert url_for('main.api_keys', service_id=service_one['id']) in page
assert url_for('main.documentation', service_id=service_one['id']) in page
def test_menu_all_services_for_platform_admin_user(mocker, app_, platform_admin_user, service_one,