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

Merge pull request #978 from alphagov/test-message-filtering

Browse Source 
remove filtering of test messages from jobs
This commit is contained in:
Chris Hill-Scott
2016-10-12 13:58:36 +01:00
committed by GitHub
parent ee8ac59d70 12d1b64a90
commit 4a7273beb4
6 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/api_keys.py
View File

@@ -69,7 +69,7 @@ def create_api_key(service_id):
] ]
form = CreateKeyForm(key_names) form = CreateKeyForm(key_names)
form.key_type.choices = filter(None, [ form.key_type.choices = filter(None, [
(KEY_TYPE_NORMAL, 'Send messages to anyone{}') (KEY_TYPE_NORMAL, 'Send messages to anyone')
if not current_service['restricted'] else None, if not current_service['restricted'] else None,
(KEY_TYPE_TEST, 'Simulate sending messages to anyone'), (KEY_TYPE_TEST, 'Simulate sending messages to anyone'),
(KEY_TYPE_TEAM, 'Only send messages to your team or whitelist') (KEY_TYPE_TEAM, 'Only send messages to your team or whitelist')

1
app/main/views/dashboard.py
View File

@@ -129,7 +129,6 @@ def get_dashboard_partials(service_id):
immediate_jobs = [ immediate_jobs = [
add_rate_to_job(job) add_rate_to_job(job)
for job in job_api_client.get_jobs(service_id, limit_days=7, statuses=statuses_to_display)['data'] for job in job_api_client.get_jobs(service_id, limit_days=7, statuses=statuses_to_display)['data']
if job['original_file_name'] != current_app.config['TEST_MESSAGE_FILENAME']
] ]
service = service_api_client.get_detailed_service(service_id) service = service_api_client.get_detailed_service(service_id)

1
app/main/views/jobs.py
View File

@@ -71,7 +71,6 @@ def view_jobs(service_id):
jobs_response = job_api_client.get_jobs(service_id, statuses=statuses_to_display, page=page) jobs_response = job_api_client.get_jobs(service_id, statuses=statuses_to_display, page=page)
jobs = [ jobs = [
add_rate_to_job(job) for job in jobs_response['data'] add_rate_to_job(job) for job in jobs_response['data']
if job['original_file_name'] != current_app.config['TEST_MESSAGE_FILENAME']
] ]
prev_page = None prev_page = None

1
tests/app/main/views/test_dashboard.py
View File

@@ -231,7 +231,6 @@ def test_should_show_recent_jobs_on_dashboard(
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
table_rows = page.find_all('tbody')[2].find_all('tr') table_rows = page.find_all('tbody')[2].find_all('tr')
assert "Test message" not in page.text
assert len(table_rows) == 4 assert len(table_rows) == 4
for index, filename in enumerate(( for index, filename in enumerate((

1
tests/app/main/views/test_jobs.py
View File

@@ -27,7 +27,6 @@ def test_get_jobs_should_return_list_of_all_real_jobs(
assert page.h1.string == 'Uploaded files' assert page.h1.string == 'Uploaded files'
jobs = [x.text for x in page.tbody.find_all('a', {'class': 'file-list-filename'})] jobs = [x.text for x in page.tbody.find_all('a', {'class': 'file-list-filename'})]
assert len(jobs) == 4 assert len(jobs) == 4
assert 'Test message' not in jobs
def test_get_jobs_shows_page_links( def test_get_jobs_shows_page_links(

1
tests/conftest.py
View File

@@ -914,7 +914,6 @@ def mock_get_jobs(mocker, api_user_active):
job_status=job_status job_status=job_status
) )
for filename, scheduled_for, job_status in ( for filename, scheduled_for, job_status in (
('Test message', '', 'finished'),
('export 1/1/2016.xls', '', 'finished'), ('export 1/1/2016.xls', '', 'finished'),
('all email addresses.xlsx', '', 'pending'), ('all email addresses.xlsx', '', 'pending'),
('applicants.ods', '', 'finished'), ('applicants.ods', '', 'finished'),