Merge pull request #227 from alphagov/poll-job-page

Make job page poll for updates
This commit is contained in:
Rebecca Law
2016-03-04 11:07:14 +00:00
12 changed files with 260 additions and 117 deletions

View File

@@ -1,5 +1,6 @@
from flask import url_for
from bs4 import BeautifulSoup
import json
def test_should_return_list_of_all_jobs(app_,
@@ -21,17 +22,19 @@ def test_should_return_list_of_all_jobs(app_,
assert len(jobs) == 5
def test_should_show_page_for_one_job(app_,
service_one,
api_user_active,
mock_login,
mock_get_user,
mock_get_user_by_email,
mock_get_service,
mock_get_service_template,
job_data,
mock_get_job,
mock_get_notifications):
def test_should_show_page_for_one_job(
app_,
service_one,
api_user_active,
mock_login,
mock_get_user,
mock_get_user_by_email,
mock_get_service,
mock_get_service_template,
job_data,
mock_get_job,
mock_get_notifications
):
service_id = job_data['service']
job_id = job_data['id']
file_name = job_data['original_file_name']
@@ -45,3 +48,35 @@ def test_should_show_page_for_one_job(app_,
content = response.get_data(as_text=True)
assert "Test Service: Your vehicle tax is about to expire" in content
assert file_name in content
def test_should_show_updates_for_one_job_as_json(
app_,
service_one,
api_user_active,
mock_login,
mock_get_user,
mock_get_user_by_email,
mock_get_service,
mock_get_service_template,
job_data,
mock_get_job,
mock_get_notifications
):
service_id = job_data['service']
job_id = job_data['id']
file_name = job_data['original_file_name']
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active)
response = client.get(url_for('main.view_job_updates', service_id=service_id, job_id=job_id))
assert response.status_code == 200
content = json.loads(response.get_data(as_text=True))
assert 'sent' in content['counts']
assert 'queued' in content['counts']
assert 'failed' in content['counts']
assert 'Recipient' in content['notifications']
assert 'Status' in content['notifications']
assert 'Started' in content['status']

View File

@@ -265,7 +265,7 @@ def test_create_job_should_call_api(
response = client.post(url, data=job_data, follow_redirects=True)
assert response.status_code == 200
assert 'Weve started sending your messages' in response.get_data(as_text=True)
assert original_file_name in response.get_data(as_text=True)
mock_create_job.assert_called_with(job_id, service_id, template_id, original_file_name, notification_count)