From 3dcc438542b001cf439b5896f8895e3b57236d72 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Tue, 23 Jul 2024 14:58:13 -0400 Subject: [PATCH] Adjusting some tests --- poetry.lock | 6 ++- tests/app/main/views/test_dashboard.py | 70 +++----------------------- 2 files changed, 13 insertions(+), 63 deletions(-) diff --git a/poetry.lock b/poetry.lock index adcd85c60..6c80bb40f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1344,9 +1344,13 @@ files = [ {file = "lxml-5.2.2-cp36-cp36m-win_amd64.whl", hash = "sha256:edcfa83e03370032a489430215c1e7783128808fd3e2e0a3225deee278585196"}, {file = "lxml-5.2.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:28bf95177400066596cdbcfc933312493799382879da504633d16cf60bba735b"}, {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3a745cc98d504d5bd2c19b10c79c61c7c3df9222629f1b6210c0368177589fb8"}, + {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1b590b39ef90c6b22ec0be925b211298e810b4856909c8ca60d27ffbca6c12e6"}, {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b336b0416828022bfd5a2e3083e7f5ba54b96242159f83c7e3eebaec752f1716"}, + {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:c2faf60c583af0d135e853c86ac2735ce178f0e338a3c7f9ae8f622fd2eb788c"}, {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:4bc6cb140a7a0ad1f7bc37e018d0ed690b7b6520ade518285dc3171f7a117905"}, + {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7ff762670cada8e05b32bf1e4dc50b140790909caa8303cfddc4d702b71ea184"}, {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:57f0a0bbc9868e10ebe874e9f129d2917750adf008fe7b9c1598c0fbbfdde6a6"}, + {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:a6d2092797b388342c1bc932077ad232f914351932353e2e8706851c870bca1f"}, {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:60499fe961b21264e17a471ec296dcbf4365fbea611bf9e303ab69db7159ce61"}, {file = "lxml-5.2.2-cp37-cp37m-win32.whl", hash = "sha256:d9b342c76003c6b9336a80efcc766748a333573abf9350f4094ee46b006ec18f"}, {file = "lxml-5.2.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b16db2770517b8799c79aa80f4053cd6f8b716f21f8aca962725a9565ce3ee40"}, @@ -1681,7 +1685,6 @@ files = [ {file = "msgpack-1.0.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5fbb160554e319f7b22ecf530a80a3ff496d38e8e07ae763b9e82fadfe96f273"}, {file = "msgpack-1.0.8-cp39-cp39-win32.whl", hash = "sha256:f9af38a89b6a5c04b7d18c492c8ccf2aee7048aff1ce8437c4683bb5a1df893d"}, {file = "msgpack-1.0.8-cp39-cp39-win_amd64.whl", hash = "sha256:ed59dd52075f8fc91da6053b12e8c89e37aa043f8986efd89e61fae69dc1b011"}, - {file = "msgpack-1.0.8-py3-none-any.whl", hash = "sha256:24f727df1e20b9876fa6e95f840a2a2651e34c0ad147676356f4bf5fbb0206ca"}, {file = "msgpack-1.0.8.tar.gz", hash = "sha256:95c02b0e27e706e48d0e5426d1710ca78e0f0628d6e89d5b5a5b91a5f12274f3"}, ] @@ -2528,6 +2531,7 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 04aee9632..eb4ff24e5 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -601,19 +601,19 @@ def test_should_show_recent_templates_on_dashboard( headers = [ header.text.strip() for header in page.find_all("h2") + page.find_all("h1") ] - assert "Messages sent" in headers + assert "Total Messages" in headers - table_rows = page.find_all("tbody")[0].find_all("tr") + table_rows = page.find_all("tbody")[1].find_all("tr") assert len(table_rows) == 2 - assert "two" in table_rows[0].find_all("th")[0].text - assert "Email template" in table_rows[0].find_all("th")[0].text - assert "200" in table_rows[0].find_all("td")[0].text + assert "two" in table_rows[0].find_all("td")[0].text + assert "Email template" in table_rows[0].find_all("td")[0].text + assert "200" in table_rows[0].find_all("td")[1].text - assert "one" in table_rows[1].find_all("th")[0].text - assert "Text message template" in table_rows[1].find_all("th")[0].text - assert "100" in table_rows[1].find_all("td")[0].text + assert "one" in table_rows[1].find_all("td")[0].text + assert "Text message template" in table_rows[1].find_all("td")[0].text + assert "100" in table_rows[1].find_all("td")[1].text @pytest.mark.parametrize( @@ -665,9 +665,6 @@ def test_should_not_show_recent_templates_on_dashboard_if_only_one_template_used # count appears as total, but not per template expected_count = stats[0]["count"] assert expected_count == 50, f"Expected count to be 50, but got {expected_count}" - assert normalize_spaces(page.select_one("#total-sms .big-number-smaller").text) == ( - "{} text messages sent in the last seven days".format(expected_count) - ) @freeze_time("2016-07-01 12:00") # 4 months into 2016 financial year @@ -929,20 +926,6 @@ def test_correct_font_size_for_big_numbers( "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( @@ -1456,43 +1439,6 @@ def test_aggregate_notifications_stats(): } -def test_service_dashboard_updates_gets_dashboard_totals( - mocker, - client_request, - mock_get_service_templates, - mock_get_template_statistics, - mock_get_service_statistics, - mock_has_no_jobs, - mock_get_annual_usage_for_service, - mock_get_free_sms_fragment_limit, - mock_get_inbound_sms_summary, -): - mocker.patch( - "app.main.views.dashboard.get_dashboard_totals", - return_value={ - "email": {"requested": 123, "delivered": 0, "failed": 0}, - "sms": {"requested": 456, "delivered": 0, "failed": 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, - ) - - numbers = [ - number.text.strip() - for number in page.find_all("span", class_="big-number-number") - ] - # assert '123' in numbers # email is disabled - assert "456" in numbers - - def test_get_dashboard_totals_adds_percentages(): stats = { "sms": {"requested": 3, "delivered": 0, "failed": 2},