Fixing tests

GSA · Nov 1, 2023 · 600114f · 600114f
1 parent 0a11211
commit 600114f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/app/templates/views/dashboard/_usage.html b/app/templates/views/dashboard/_usage.html
@@ -3,7 +3,7 @@
 <div class='grid-row grid-gap ajax-block-container'>
   <div class='grid-col-12'>
 
-    <table class="usa-table usa-table--borderless margin-bottom-5">
+    <table class="usa-table usa-table--borderless margin-top-1 margin-bottom-5">
       <caption class="usa-sr-only">
         Daily
       </caption>

diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
@@ -30,10 +30,10 @@ <h2 class="font-body-xl margin-0">
 
     {{ ajax_block(partials, updates_url, 'template-statistics') }}
 
-    <h2 class="margin-bottom-1">Usage</h2>
+    <h2 class="margin-top-4 margin-bottom-1">Usage</h2>
     <h3 class="margin-bottom-0">Daily</h3>
     <p class="margin-0">Across all services</p>
-    <table class="usa-table usa-table--borderless margin-bottom-5">
+    <table class="usa-table usa-table--borderless margin-top-1 margin-bottom-5">
       <caption class="usa-sr-only">
         Daily
       </caption>
@@ -54,7 +54,7 @@ <h3 class="margin-bottom-0">Daily</h3>
     </table>
 
     {% if current_user.has_permissions('manage_service') %}
-      <h3 class='font-body-md margin-bottom-1'>2023</h3>
+      <h3 class='font-body-md margin-bottom-0'>2023</h3>
       {{ ajax_block(partials, updates_url, 'usage') }}
       {{ show_more(
         url_for(".usage", service_id=current_service['id']),

diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
@@ -471,7 +471,7 @@ def test_should_show_recent_templates_on_dashboard(
     headers = [
         header.text.strip() for header in page.find_all("h2") + page.find_all("h1")
     ]
-    assert "In the last seven days" in headers
+    assert "Messages sent" in headers
 
     table_rows = page.find_all("tbody")[0].find_all("tr")
 
@@ -1522,6 +1522,8 @@ def test_service_dashboard_shows_usage(
     page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID)
 
     assert normalize_spaces(page.select_one("[data-key=usage]").text) == (
+        "Daily Usage Remaining "
+        "40,000 "
         "$29.85 "
         "spent on text messages"
         # Disabled for pilot
@@ -1556,4 +1558,4 @@ def test_service_dashboard_shows_free_allowance(
 
     usage_text = normalize_spaces(page.select_one("[data-key=usage]").text)
     assert "spent on text messages" not in usage_text
-    assert "249,000 free text messages left" in usage_text
+    assert "Daily Usage Remaining -209,000 249,000" in usage_text