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

Revert "Merge pull request #1333 from alphagov/fix-empty-table-message"

Browse Source 
This reverts commit 114bac7b80, reversing
changes made to 69445380d9.
This commit is contained in:
Chris Hill-Scott
2017-06-23 15:55:54 +01:00
parent c52bfc5b81
commit 5c0f6796e4
3 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -386,7 +386,7 @@ def get_job_partials(job):
def add_preview_of_content_to_notifications(notifications): def add_preview_of_content_to_notifications(notifications):
return [ return (
dict( dict(
preview_of_content=( preview_of_content=(
str(Template(notification['template'], notification['personalisation'])) str(Template(notification['template'], notification['personalisation']))
@@ -396,4 +396,4 @@ def add_preview_of_content_to_notifications(notifications):
**notification **notification
) )
for notification in notifications for notification in notifications
] )

18
tests/app/main/views/test_activity.py
View File

@@ -9,7 +9,6 @@ from bs4 import BeautifulSoup
from app.main.views.jobs import get_time_left, get_status_filters from app.main.views.jobs import get_time_left, get_status_filters
from tests import notification_json from tests import notification_json
from tests.conftest import SERVICE_ONE_ID from tests.conftest import SERVICE_ONE_ID
from tests.app.test_utils import normalize_spaces
from freezegun import freeze_time from freezegun import freeze_time
@@ -136,23 +135,6 @@ def test_can_show_notifications(
assert json_content.keys() == {'counts', 'notifications'} assert json_content.keys() == {'counts', 'notifications'}
def test_shows_message_when_no_notifications(
client_request,
mock_get_detailed_service,
mock_get_notifications_with_no_notifications,
):
page = client_request.get(
'main.view_notifications',
service_id=SERVICE_ONE_ID,
message_type='sms',
)
assert normalize_spaces(page.select('tbody tr')[0].text) == (
'No messages found'
)
@pytest.mark.parametrize(( @pytest.mark.parametrize((
'initial_query_arguments,' 'initial_query_arguments,'
'form_post_data,' 'form_post_data,'

4
tests/conftest.py
View File

@@ -1143,9 +1143,7 @@ def mock_get_notifications_with_no_notifications(mocker):
status=None, status=None,
limit_days=None, limit_days=None,
include_jobs=None, include_jobs=None,
include_from_test_key=None, include_from_test_key=None):
to=None,
):
return notification_json(service_id, rows=0) return notification_json(service_id, rows=0)
return mocker.patch( return mocker.patch(