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

Refactor loop to separate function and use user model

Browse Source 
when getting a list of security keys

Also test separately that we are correctly choosing key out of list
of security keys. Previously we have done it as a part
of testing pages where where we were calling API to get a list
of keys, but then choosing one of those keys based on id.

Also remove redundant second test credential after PR review

Also remove redundant return value from mocks in update name tests
This commit is contained in:
Pea Tyczynska
2021-05-25 11:15:57 +01:00
parent 8501aa4ad6
commit 04d1d97d4c
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/app/main/views/test_user_profile.py
View File

@@ -6,6 +6,8 @@ from flask import url_for
from notifications_python_client.errors import HTTPError
from notifications_utils.url_safe_token import generate_token
from app.main.views.user_profile import get_key_from_list_of_keys
from app.models.user import WebAuthnCredential
from tests.conftest import (
create_api_user_active,
normalize_spaces,
@@ -381,18 +383,22 @@ def test_should_show_security_keys_page(
assert register_button.text.strip() == 'Register a key'
def test_get_key_from_list_of_keys(webauthn_credential, webauthn_credential_2):
list_of_keys = [WebAuthnCredential(json) for json in [webauthn_credential, webauthn_credential_2]]
assert get_key_from_list_of_keys(webauthn_credential["id"], list_of_keys) == WebAuthnCredential(webauthn_credential)
def test_should_show_manage_security_key_page(
mocker,
client_request,
platform_admin_user,
webauthn_credential,
webauthn_credential_2
):
client_request.login(platform_admin_user)
mocker.patch(
'app.user_api_client.get_webauthn_credentials_for_user',
return_value=[webauthn_credential, webauthn_credential_2],
return_value=[webauthn_credential],
)
page = client_request.get('.user_profile_manage_security_key', key_id=webauthn_credential['id'])
@@ -453,21 +459,17 @@ def test_should_redirect_after_change_of_security_key_name(
client_request,
platform_admin_user,
webauthn_credential,
webauthn_credential_2,
mocker
):
client_request.login(platform_admin_user)
mocker.patch(
'app.user_api_client.get_webauthn_credentials_for_user',
return_value=[webauthn_credential, webauthn_credential_2],
)
mock_update = mocker.patch(
'app.user_api_client.update_webauthn_credential_name_for_user',
return_value=[webauthn_credential],
)
mock_update = mocker.patch('app.user_api_client.update_webauthn_credential_name_for_user')
client_request.post(
'main.user_profile_manage_security_key',
key_id=webauthn_credential['id'],
@@ -490,21 +492,17 @@ def test_user_profile_manage_security_key_should_not_call_api_if_key_name_stays_
client_request,
platform_admin_user,
webauthn_credential,
webauthn_credential_2,
mocker
):
client_request.login(platform_admin_user)
mocker.patch(
'app.user_api_client.get_webauthn_credentials_for_user',
return_value=[webauthn_credential, webauthn_credential_2],
)
mock_update = mocker.patch(
'app.user_api_client.update_webauthn_credential_name_for_user',
return_value=[webauthn_credential],
)
mock_update = mocker.patch('app.user_api_client.update_webauthn_credential_name_for_user')
client_request.post(
'main.user_profile_manage_security_key',
key_id=webauthn_credential['id'],
@@ -524,13 +522,12 @@ def test_shows_delete_link_for_security_key(
client_request,
platform_admin_user,
webauthn_credential,
webauthn_credential_2
):
client_request.login(platform_admin_user)
mocker.patch(
'app.user_api_client.get_webauthn_credentials_for_user',
return_value=[webauthn_credential, webauthn_credential_2],
return_value=[webauthn_credential],
)
page = client_request.get('.user_profile_manage_security_key', key_id=webauthn_credential['id'])
@@ -545,14 +542,13 @@ def test_confirm_delete_security_key(
client_request,
platform_admin_user,
webauthn_credential,
webauthn_credential_2,
mocker
):
client_request.login(platform_admin_user)
mocker.patch(
'app.user_api_client.get_webauthn_credentials_for_user',
return_value=[webauthn_credential, webauthn_credential_2],
return_value=[webauthn_credential],
)
page = client_request.get(