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

Stop the user fixtures being called as a functions from conftest

Browse Source 
Stopped fixtures in conftest.py from calling the fixtures which return
user json as if they were functions. Deleted two fixtures that are now no
longer needed as a result of the changes to conftest.py.
This commit is contained in:
Katie Smith
2019-12-19 10:22:45 +00:00
parent 02253d32c5
commit c6779e6f92
4 changed files with 52 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/app/main/views/test_feedback.py
View File

@@ -12,13 +12,7 @@ from app.main.views.feedback import (
has_live_services,
in_business_hours,
)
from tests.conftest import (
active_user_with_permissions,
mock_get_services,
mock_get_services_with_no_services,
mock_get_services_with_one_service,
normalize_spaces,
)
from tests.conftest import normalize_spaces
def no_redirect():
@@ -105,10 +99,10 @@ def test_get_feedback_page_with_prefilled_body(
fake_uuid,
prefilled_body,
expected_textarea,
active_user_with_permissions,
):
user = active_user_with_permissions(fake_uuid)
user['email_address'] = 'test@marinemanagement.org.uk'
mocker.patch('app.user_api_client.get_user', return_value=user)
active_user_with_permissions['email_address'] = 'test@marinemanagement.org.uk'
mocker.patch('app.user_api_client.get_user', return_value=active_user_with_permissions)
mock_post = mocker.patch('app.main.views.feedback.zendesk_client.create_ticket')
page = client_request.get(
'main.feedback',
@@ -400,19 +394,16 @@ def test_doesnt_lose_message_if_post_across_closing(
assert 'feedback_message' not in session
@pytest.mark.parametrize('get_services_mock, expected_return_value', [
(mock_get_services, True),
(mock_get_services_with_no_services, False),
(mock_get_services_with_one_service, False),
])
def test_has_live_services(
mocker,
fake_uuid,
get_services_mock,
expected_return_value
):
get_services_mock(mocker, fake_uuid)
assert has_live_services(12345) == expected_return_value
def test_has_live_services(mock_get_services):
assert has_live_services(12345) is True
def test_has_live_services_when_there_are_no_services(mock_get_services_with_no_services):
assert has_live_services(12345) is False
def test_has_live_services_when_service_is_not_live(mock_get_services_with_one_service):
assert has_live_services(12345) is False
@pytest.mark.parametrize('when, is_in_business_hours', [