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

separate get_job and get_jobs in job_api_client

Browse Source 
also remove the status parameter, as we never use it anywhere
This commit is contained in:
Leo Hemsted
2016-09-22 09:53:33 +01:00
parent 5bb700ac81
commit 549a17c1f7
6 changed files with 16 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/app/notify_client/test_job_client.py
View File

@@ -66,37 +66,6 @@ def test_client_gets_job_by_service_and_job(mocker):
mock_get.assert_called_once_with(url=expected_url, params={})
def test_client_gets_job_by_service_and_job_filtered_by_status(mocker):
mocker.patch('app.notify_client.current_user', id='1')
service_id = 'service_id'
job_id = 'job_id'
expected_url = '/service/{}/job/{}'.format(service_id, job_id)
client = JobApiClient()
mock_get = mocker.patch('app.notify_client.job_api_client.JobApiClient.get')
client.get_job(service_id, job_id, limit_days=1, status='failed')
mock_get.assert_called_once_with(url=expected_url, params={'status': 'failed'})
def test_client_gets_job_by_service_filtered_by_status(mocker):
mocker.patch('app.notify_client.current_user', id='1')
service_id = 'service_id'
expected_url = '/service/{}/job'.format(service_id)
client = JobApiClient()
mock_get = mocker.patch('app.notify_client.job_api_client.JobApiClient.get')
client.get_job(service_id, limit_days=1, status='failed')
mock_get.assert_called_once_with(url=expected_url, params={'limit_days': 1})
def test_client_parses_job_stats(mocker):
mocker.patch('app.notify_client.current_user', id='1')
@@ -247,7 +216,7 @@ def test_client_parses_job_stats_for_service(mocker):
client = JobApiClient()
mock_get = mocker.patch('app.notify_client.job_api_client.JobApiClient.get', return_value=expected_data)
result = client.get_job(service_id)
result = client.get_jobs(service_id)
mock_get.assert_called_once_with(url=expected_url, params={})
assert result['data'][0]['id'] == job_1_id
@@ -309,7 +278,7 @@ def test_client_parses_empty_job_stats_for_service(mocker):
client = JobApiClient()
mock_get = mocker.patch('app.notify_client.job_api_client.JobApiClient.get', return_value=expected_data)
result = client.get_job(service_id)
result = client.get_jobs(service_id)
mock_get.assert_called_once_with(url=expected_url, params={})
assert result['data'][0]['id'] == job_1_id

2
tests/conftest.py
View File

@@ -923,7 +923,7 @@ def mock_get_jobs(mocker, api_user_active):
)
]}
return mocker.patch('app.job_api_client.get_job', side_effect=_get_jobs)
return mocker.patch('app.job_api_client.get_jobs', side_effect=_get_jobs)
@pytest.fixture(scope='function')