From baf9b69fbb80b9e8313ac6cfdd47b3111a16979d Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 25 Feb 2025 14:01:56 -0800 Subject: [PATCH] fix pytest --- tests/app/main/views/test_dashboard.py | 207 +++++++------------------ 1 file changed, 56 insertions(+), 151 deletions(-) diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 461888c5c..626cd782b 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -193,6 +193,12 @@ mock_daily_stats_by_user = { }, } +mock_service_message_ratio = { + "messages_remaining": 71919, + "messages_sent": 28081, + "total_message_limit": 100000 + } + @pytest.mark.parametrize( "user", @@ -252,12 +258,8 @@ def test_get_started( ) mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get( "main.service_dashboard", @@ -286,12 +288,8 @@ def test_get_started_is_hidden_once_templates_exist( ) mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get( "main.service_dashboard", @@ -317,12 +315,8 @@ def test_inbound_messages_not_visible_to_service_without_permissions( service_one["permissions"] = [] mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get( "main.service_dashboard", @@ -348,12 +342,8 @@ def test_inbound_messages_shows_count_of_messages_when_there_are_messages( ): service_one["permissions"] = ["inbound_sms"] mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get( "main.service_dashboard", @@ -384,12 +374,8 @@ def test_inbound_messages_shows_count_of_messages_when_there_are_no_messages( ): service_one["permissions"] = ["inbound_sms"] mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get( "main.service_dashboard", @@ -638,12 +624,8 @@ def test_should_show_recent_templates_on_dashboard( ) mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get( "main.service_dashboard", @@ -690,12 +672,8 @@ def test_should_not_show_recent_templates_on_dashboard_if_only_one_template_used ) mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID) main = page.select_one("main").text @@ -849,12 +827,8 @@ def test_should_show_upcoming_jobs_on_dashboard( mock_get_inbound_sms_summary, ): mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get( "main.service_dashboard", @@ -896,12 +870,8 @@ 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.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get( "main.service_dashboard", @@ -926,12 +896,8 @@ def test_should_not_show_upcoming_jobs_on_dashboard_if_service_has_no_jobs( ): mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get( "main.service_dashboard", @@ -1016,12 +982,8 @@ def test_should_not_show_jobs_on_dashboard_for_users_with_uploads_page( mock_get_inbound_sms_summary, ): mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get( "main.service_dashboard", @@ -1284,12 +1246,8 @@ def test_menu_send_messages( mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = _test_dashboard_menu( client_request, @@ -1325,12 +1283,8 @@ def test_menu_manage_service( ): mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = _test_dashboard_menu( client_request, @@ -1366,12 +1320,8 @@ def test_menu_main_settings( ): mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = _test_settings_menu( client_request, @@ -1406,12 +1356,8 @@ def test_menu_manage_api_keys( ): mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = _test_dashboard_menu( client_request, @@ -1447,12 +1393,8 @@ def test_menu_all_services_for_platform_admin_user( ): mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = _test_dashboard_menu( client_request, mocker, platform_admin_user, service_one, [] @@ -1490,12 +1432,8 @@ def test_route_for_service_permissions( ) mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) validate_route_permission( mocker, @@ -1639,12 +1577,8 @@ def test_org_breadcrumbs_do_not_show_if_service_has_no_org( ): mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID) @@ -1710,12 +1644,8 @@ def test_org_breadcrumbs_show_if_user_is_a_member_of_the_services_org( ) mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID) @@ -1750,12 +1680,8 @@ def test_org_breadcrumbs_do_not_show_if_user_is_a_member_of_the_services_org_but mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID) @@ -1792,12 +1718,8 @@ def test_org_breadcrumbs_show_if_user_is_platform_admin( mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) client_request.login(platform_admin_user, service_one_json) @@ -1829,14 +1751,9 @@ def test_breadcrumb_shows_if_service_is_suspended( ) mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) - mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID) @@ -1869,12 +1786,8 @@ def test_service_dashboard_shows_usage( ) mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) service_one["permissions"] = permissions @@ -1909,12 +1822,8 @@ def test_service_dashboard_shows_free_allowance( ) mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) @@ -1930,12 +1839,8 @@ def test_service_dashboard_shows_batched_jobs( ): mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS) mocker.patch( - "app.main.views.dashboard.get_daily_stats", return_value=mock_daily_stats - ) - - mocker.patch( - "app.main.views.dashboard.get_daily_stats_by_user", - return_value=mock_daily_stats_by_user, + "app.service_api_client.get_service_message_ratio", + return_value=mock_service_message_ratio, ) page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID)