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

Fix failing tests

Browse Source
This commit is contained in:
Rebecca Law
2018-02-23 17:09:41 +00:00
parent 22bbc0d6d8
commit 8f5b6491f3
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/app/main/views/test_organisations.py
View File

@@ -11,7 +11,7 @@ from datetime import (
from tests.conftest import ( from tests.conftest import (
normalize_spaces normalize_spaces
) )
from unittest.mock import ANY from unittest.mock import ANY, Mock
from app.notify_client.models import InvitedOrgUser from app.notify_client.models import InvitedOrgUser
from notifications_python_client.errors import HTTPError from notifications_python_client.errors import HTTPError
@@ -244,19 +244,6 @@ def test_invite_org_user_errors_when_same_email_as_inviter(
# Broken # Broken
def test_accept_invite_with_invalid_token(
client,
mocker
):
mocker.patch(
'app.org_invite_api_client.check_token',
side_effect=HTTPError(Response(status=400), {'result': 'error', 'message': 'default error message'})
)
response = client.get(url_for('main.accept_org_invite', token='thisisnotarealtoken'))
assert response.status_code == 400
def test_accepted_invite_when_user_already_logged_in( def test_accepted_invite_when_user_already_logged_in(
logged_in_client, logged_in_client,
mock_check_org_invite_token mock_check_org_invite_token
@@ -318,6 +305,7 @@ def test_existing_user_invite_already_is_member_of_organisation(
mock_get_user_by_email, mock_get_user_by_email,
mock_get_users_for_organisation, mock_get_users_for_organisation,
mock_accept_org_invite, mock_accept_org_invite,
mock_add_user_to_organisation,
fake_uuid fake_uuid
): ):
response = client.get(url_for('main.accept_org_invite', token='thisisnotarealtoken')) response = client.get(url_for('main.accept_org_invite', token='thisisnotarealtoken'))
@@ -329,12 +317,12 @@ def test_existing_user_invite_already_is_member_of_organisation(
_external=True _external=True
) )
mock_accept_org_invite.assert_called_once_with('596364a0-858e-42c8-9062-a8fe822260af', fake_uuid) mock_accept_org_invite.assert_called_once_with('596364a0-858e-42c8-9062-a8fe822260af', ANY)
mock_get_user_by_email.assert_called_once_with('invited_user@test.gov.uk') mock_get_user_by_email.assert_called_once_with('invited_user@test.gov.uk')
mock_get_users_for_organisation.assert_called_once_with('596364a0-858e-42c8-9062-a8fe822260af') mock_get_users_for_organisation.assert_called_once_with('596364a0-858e-42c8-9062-a8fe822260af')
def test_exisiting_user_invite_not_a_member_of_organisation( def test_existing_user_invite_not_a_member_of_organisation(
client, client,
mock_check_org_invite_token, mock_check_org_invite_token,
mock_get_user_by_email, mock_get_user_by_email,

16
tests/conftest.py
View File

@@ -1376,6 +1376,19 @@ def mock_get_user(mocker, user=None):
'app.user_api_client.get_user', side_effect=_get_user) 'app.user_api_client.get_user', side_effect=_get_user)
@pytest.fixture(scope='function')
def mock_get_organisation_user(mocker, user=None):
if user is None:
user = api_user_active(fake_uuid())
def _get_user(id_):
user.id = id_
return user
return mocker.patch(
'app.user_api_client.get_user', side_effect=_get_user)
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def mock_get_locked_user(mocker, api_user_locked): def mock_get_locked_user(mocker, api_user_locked):
return mock_get_user(mocker, user=api_user_locked) return mock_get_user(mocker, user=api_user_locked)
@@ -2778,9 +2791,8 @@ def mock_check_org_invite_token(mocker, sample_org_invite):
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def mock_check_org_cancelled_invite_token(mocker, sample_org_invite): def mock_check_org_cancelled_invite_token(mocker, sample_org_invite):
sample_org_invite['status'] = 'cancelled'
def _check_org_token(token): def _check_org_token(token):
sample_org_invite['status'] = 'cancelled'
return InvitedOrgUser(**sample_org_invite) return InvitedOrgUser(**sample_org_invite)
return mocker.patch('app.org_invite_api_client.check_token', side_effect=_check_org_token) return mocker.patch('app.org_invite_api_client.check_token', side_effect=_check_org_token)