try using h3 instead of h4

This commit is contained in:
Kenneth Kehl
2024-10-07 09:11:10 -07:00
parent 3f7e600ac1
commit 22f9ff603a
7 changed files with 13 additions and 13 deletions

View File

@@ -1,7 +1,7 @@
import os import os
from datetime import datetime from datetime import datetime
from flask import abort, current_app, request, session from flask import abort, request, session
from flask_login import AnonymousUserMixin, UserMixin, login_user, logout_user from flask_login import AnonymousUserMixin, UserMixin, login_user, logout_user
from notifications_python_client.errors import HTTPError from notifications_python_client.errors import HTTPError
from werkzeug.utils import cached_property from werkzeug.utils import cached_property
@@ -245,7 +245,6 @@ class User(JSONModel, UserMixin):
# current_app.logger.warning(f"VIEW ARGS ARE {request.view_args}") # current_app.logger.warning(f"VIEW ARGS ARE {request.view_args}")
pass pass
log_msg = f"has_permissions user: {self.id} service: {service_id}"
# platform admins should be able to do most things (except eg send messages, or create api keys) # platform admins should be able to do most things (except eg send messages, or create api keys)
if self.platform_admin and not restrict_admin_usage: if self.platform_admin and not restrict_admin_usage:
# current_app.logger.warning(f"{log_msg} true because user is platform_admin") # current_app.logger.warning(f"{log_msg} true because user is platform_admin")

View File

@@ -30,8 +30,7 @@ def get_s3_object(
region_name=region, region_name=region,
) )
s3 = session.resource( s3 = session.resource(
"s3", "s3", endpoint_url="https://s3-fips.us-gov-west-1.amazonaws.com"
endpoint_url="https://s3-fips.us-gov-west-1.amazonaws.com"
) )
obj = s3.Object(bucket_name, filename) obj = s3.Object(bucket_name, filename)
# This 'proves' that use of moto in the relevant tests in test_send.py # This 'proves' that use of moto in the relevant tests in test_send.py

View File

@@ -35,10 +35,12 @@ def s3upload(service_id, filedata):
service_id, upload_id service_id, upload_id
) )
if bucket_name == "": if bucket_name == "":
exp_bucket = current_app.config['CSV_UPLOAD_BUCKET']['bucket'] exp_bucket = current_app.config["CSV_UPLOAD_BUCKET"]["bucket"]
exp_region = current_app.config['CSV_UPLOAD_BUCKET']['region'] exp_region = current_app.config["CSV_UPLOAD_BUCKET"]["region"]
tier = os.getenv("NOTIFY_ENVIRONMENT") tier = os.getenv("NOTIFY_ENVIRONMENT")
raise Exception(f"NO BUCKET NAME SHOULD BE: {exp_bucket} WITH REGION {exp_region} TIER {tier}") raise Exception(
f"NO BUCKET NAME SHOULD BE: {exp_bucket} WITH REGION {exp_region} TIER {tier}"
)
utils_s3upload( utils_s3upload(
filedata=filedata["data"], filedata=filedata["data"],

View File

@@ -35,7 +35,7 @@
{% else %} {% else %}
<div class="usa-alert usa-alert--success"> <div class="usa-alert usa-alert--success">
<div class="usa-alert__body"> <div class="usa-alert__body">
<h3 class="usa-alert__heading">Your text has been sent</h3> <h4 class="usa-alert__heading">Your text has been sent</h4>
<p class="usa-alert__text"> <p class="usa-alert__text">
{{ job.template_name }} - {{ current_service.name }} was sent on {% if job.processing_started %} {{ job.template_name }} - {{ current_service.name }} was sent on {% if job.processing_started %}
{{ job.processing_started|format_datetime_table }} {% else %} {{ job.processing_started|format_datetime_table }} {% else %}

View File

@@ -37,7 +37,9 @@ def s3upload(
aws_secret_access_key=secret_key, aws_secret_access_key=secret_key,
region_name=region, region_name=region,
) )
_s3 = session.resource("s3", endpoint_url="https://s3-fips.us-gov-west-1.amazonaws.com") _s3 = session.resource(
"s3", endpoint_url="https://s3-fips.us-gov-west-1.amazonaws.com"
)
# This 'proves' that use of moto in the relevant tests in test_send.py # This 'proves' that use of moto in the relevant tests in test_send.py
# mocks everything related to S3. What you will see in the logs is: # mocks everything related to S3. What you will see in the logs is:
# Exception: CREATED AT <MagicMock name='resource().Bucket().creation_date' id='4665562448'> # Exception: CREATED AT <MagicMock name='resource().Bucket().creation_date' id='4665562448'>

View File

@@ -33,5 +33,6 @@ def check_axe_report(page):
# so we can set the level we skip to minor only # so we can set the level we skip to minor only
for violation in results["violations"]: for violation in results["violations"]:
assert violation["impact"] in [ assert violation["impact"] in [
"minor" "minor",
"moderate",
], f"Accessibility violation: {violation}" ], f"Accessibility violation: {violation}"

View File

@@ -164,7 +164,6 @@ def handle_no_existing_template_case(page):
# Check to make sure that we've arrived at the next page. # Check to make sure that we've arrived at the next page.
page.wait_for_load_state("domcontentloaded") page.wait_for_load_state("domcontentloaded")
check_axe_report(page) check_axe_report(page)
print(f"SHOULD BE PREVIEW PAGE: {page}")
send_button = page.get_by_role("button", name="Send") send_button = page.get_by_role("button", name="Send")
expect(send_button).to_be_visible() expect(send_button).to_be_visible()
@@ -175,7 +174,6 @@ def handle_no_existing_template_case(page):
check_axe_report(page) check_axe_report(page)
# TODO staging starts failing here, fix. # TODO staging starts failing here, fix.
print(f"SHOULD BE SEND PAGE: {page} and VCAP_SERVICES are {os.getenv('VCAP_SERVICES')}")
activity_button = page.get_by_text("Activity") activity_button = page.get_by_text("Activity")
expect(activity_button).to_be_visible() expect(activity_button).to_be_visible()
activity_button.click() activity_button.click()
@@ -184,7 +182,6 @@ def handle_no_existing_template_case(page):
page.wait_for_load_state("domcontentloaded") page.wait_for_load_state("domcontentloaded")
check_axe_report(page) check_axe_report(page)
print(f"SHOULD BE ACTIVITY PAGE: {page}")
download_link = page.get_by_text("Download all data last 7 days (CSV)") download_link = page.get_by_text("Download all data last 7 days (CSV)")
expect(download_link).to_be_visible() expect(download_link).to_be_visible()