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

Fix unit tests and put the antivirus check back in

Browse Source
This commit is contained in:
Rebecca Law
2019-12-06 10:22:23 +00:00
parent 833a5cad8f
commit f9e01e0b45
3 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/app/main/views/test_uploads.py
View File

@@ -20,7 +20,7 @@ from tests.conftest import SERVICE_ONE_ID
def test_no_upload_letters_button_without_permission(
client_request,
service_one,
mock_get_jobs,
mock_get_uploads,
extra_permissions,
):
service_one['permissions'] += extra_permissions
@@ -31,7 +31,7 @@ def test_no_upload_letters_button_without_permission(
def test_get_upload_hub_page(
client_request,
service_one,
mock_get_jobs,
mock_get_uploads,
):
service_one['permissions'] += ['letter', 'upload_letters']
page = client_request.get('main.uploads', service_id=SERVICE_ONE_ID)

36
tests/conftest.py
View File

@@ -1936,6 +1936,42 @@ def mock_get_jobs(mocker, api_user_active):
return mocker.patch('app.job_api_client.get_jobs', side_effect=_get_jobs)
@pytest.fixture(scope='function')
def mock_get_uploads(mocker, api_user_active):
def _get_jobs(service_id, limit_days=None, statuses=None, page=1):
if statuses is None:
statuses = ['', 'scheduled', 'pending', 'cancelled', 'finished']
jobs = [
job_json(
service_id,
api_user_active,
original_file_name=filename,
scheduled_for=scheduled_for,
job_status=job_status,
template_version=template_version,
)
for filename, scheduled_for, job_status, template_version in (
('export 1/1/2016.xls', '', 'finished', 1),
('all email addresses.xlsx', '', 'pending', 1),
('applicants.ods', '', 'finished', 1),
('thisisatest.csv', '', 'finished', 2),
('send_me_later.csv', '2016-01-01 11:09:00.061258', 'scheduled', 1),
('even_later.csv', '2016-01-01 23:09:00.061258', 'scheduled', 1),
('full_of_regret.csv', '2016-01-01 23:09:00.061258', 'cancelled', 1)
)
]
return {
'data': [job for job in jobs if job['job_status'] in statuses],
'links': {
'prev': 'services/{}/jobs?page={}'.format(service_id, page - 1),
'next': 'services/{}/jobs?page={}'.format(service_id, page + 1)
}
}
return mocker.patch('app.job_api_client.get_uploads', side_effect=_get_jobs)
@pytest.fixture(scope='function')
def mock_get_notifications(
mocker,