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

Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations

Browse Source 
# Conflicts:
#	app/assets/sass/uswds/_uswds-theme-custom-styles.scss
#	app/templates/views/dashboard/dashboard.html
#	gulpfile.js
#	tests/app/main/views/test_dashboard.py
This commit is contained in:
Jonathan Bobel
2024-07-30 10:45:53 -04:00
parent c7b90e3010 044175bac6
commit 1912ffbbcf
44 changed files with 362 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,10 +305,6 @@ def test_inbound_messages_shows_count_of_messages_when_there_are_messages(
mock_get_inbound_sms_summary,
):
service_one["permissions"] = ["inbound_sms"]
mocker.patch(
"app.notification_api_client.get_notifications_for_service",
return_value=FAKE_ONE_OFF_NOTIFICATION,
)
page = client_request.get(
"main.service_dashboard",
service_id=SERVICE_ONE_ID,
@@ -337,10 +333,6 @@ def test_inbound_messages_shows_count_of_messages_when_there_are_no_messages(
mock_get_inbound_sms_summary_with_no_messages,
):
service_one["permissions"] = ["inbound_sms"]
mocker.patch(
"app.notification_api_client.get_notifications_for_service",
return_value=FAKE_ONE_OFF_NOTIFICATION,
)
page = client_request.get(
"main.service_dashboard",
service_id=SERVICE_ONE_ID,
@@ -842,10 +834,6 @@ def test_should_not_show_upcoming_jobs_on_dashboard_if_count_is_0(
},
)
mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS)
mocker.patch(
"app.notification_api_client.get_notifications_for_service",
return_value=FAKE_ONE_OFF_NOTIFICATION,
)
page = client_request.get(
"main.service_dashboard",
service_id=SERVICE_ONE_ID,
@@ -922,10 +910,23 @@ def test_correct_font_size_for_big_numbers(
mocker.patch("app.main.views.dashboard.get_dashboard_totals", return_value=totals)
mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS)
mocker.patch(
"app.notification_api_client.get_notifications_for_service",
return_value=FAKE_ONE_OFF_NOTIFICATION,
)
# mocker.patch(
# "app.notification_api_client.get_notifications_for_service",
# return_value=FAKE_ONE_OFF_NOTIFICATION,
# page = client_request.get(
# "main.service_dashboard",
# service_id=service_one["id"],
# )
# assert (
# (len(page.select_one("[data-key=totals]").select(".grid-col-12")))
# == (
# # len(page.select_one('[data-key=usage]').select('.grid-col-6'))
# # ) == (
# len(page.select(".big-number-with-status .big-number-smaller"))
# )
# == 1
# )
def test_should_not_show_jobs_on_dashboard_for_users_with_uploads_page(
@@ -941,10 +942,6 @@ def test_should_not_show_jobs_on_dashboard_for_users_with_uploads_page(
mock_get_free_sms_fragment_limit,
mock_get_inbound_sms_summary,
):
mocker.patch(
"app.notification_api_client.get_notifications_for_service",
return_value=FAKE_ONE_OFF_NOTIFICATION,
)
page = client_request.get(
"main.service_dashboard",
service_id=SERVICE_ONE_ID,