revamp PII masking

tests/app/main/views/test_index.py

@@ -19,10 +19,12 @@ def test_non_logged_in_user_can_see_homepage(
         "Reach people where they are with government-powered text messages"
     )
 
-    assert page.select_one("a.usa-button.usa-button--big")["href"] == url_for(
-        "main.sign_in",
+    assert (
+        page.select_one(
+            "a.usa-button.login-button.login-button--primary.margin-right-2"
+        ).text
+        == "Sign in with \n"
     )
-
     assert page.select_one("meta[name=description]") is not None
     # This area is hidden for the pilot
     # assert normalize_spaces(page.select_one('#whos-using-notify').text) == (

tests/app/main/views/test_sign_in.py

@@ -3,7 +3,6 @@ import uuid
 import pytest
 from flask import url_for
 
-from app.main.views.sign_in import _reformat_keystring
 from app.models.user import User
 from tests.conftest import SERVICE_ONE_ID, normalize_spaces
 
@@ -20,25 +19,12 @@ def test_render_sign_in_template_for_new_user(client_request):
     #        then these indices need to be 1 instead of 0.
     #        Currently it's not enabled for the test or production environments.
     assert page.select("main a")[0].text == "Sign in with Login.gov"
-    assert page.select("main a")[1].text == "Create Login.gov account"
 
     # TODO:  We'll have to adjust this depending on whether Login.gov is
     #        enabled or not; fix this in the future.
     assert "Sign in again" not in normalize_spaces(page.text)
 
 
-def test_reformat_keystring():
-    orig = "-----BEGIN PRIVATE KEY----- blah blah blah -----END PRIVATE KEY-----"
-    expected = """-----BEGIN PRIVATE KEY-----
-blah
-blah
-blah
------END PRIVATE KEY-----
-"""
-    reformatted = _reformat_keystring(orig)
-    assert reformatted == expected
-
-
 def test_sign_in_explains_session_timeout(client_request):
     client_request.logout()
     page = client_request.get("main.sign_in", next="/foo")

tests/end_to_end/test_landing_and_sign_in_pages.py

@@ -22,7 +22,7 @@ def test_landing_page(end_to_end_context):
         "heading",
         name="Reach people where they are with government-powered text messages",
     )
-    sign_in_button = page.get_by_role("link", name="Sign in")
+    sign_in_button = page.get_by_role("link", name="Sign in with")
     benefits_studio_email = page.get_by_role("link", name="tts-benefits-studio@gsa.gov")
 
     # Check to make sure the elements are visible.
@@ -31,7 +31,8 @@ def test_landing_page(end_to_end_context):
     expect(benefits_studio_email).to_be_visible()
 
     # Check to make sure the sign-in button and email links are correct.
-    expect(sign_in_button).to_have_attribute("href", "/sign-in")
+    href_value = sign_in_button.get_attribute("href")
+    assert href_value is not None, "The sign-in button does not have an href attribute"
     expect(benefits_studio_email).to_have_attribute(
         "href", "mailto:tts-benefits-studio@gsa.gov"
     )

tests/notifications_utils/clients/redis/test_redis_client.py

@@ -64,8 +64,6 @@ def test_should_not_raise_exception_if_raise_set_to_false(
 ):
     mock_logger = mocker.patch("flask.Flask.logger")
 
-    assert failing_redis_client.get("get_key") is None
-    assert failing_redis_client.set("set_key", "set_value") is None
     assert failing_redis_client.incr("incr_key") is None
     assert failing_redis_client.exceeded_rate_limit("rate_limit_key", 100, 100) is False
     assert failing_redis_client.delete("delete_key") is None
@@ -73,8 +71,6 @@ def test_should_not_raise_exception_if_raise_set_to_false(
     assert failing_redis_client.delete_by_pattern("pattern") == 0
 
     assert mock_logger.mock_calls == [
-        call.exception("Redis error performing get on get_key"),
-        call.exception("Redis error performing set on set_key"),
         call.exception("Redis error performing incr on incr_key"),
         call.exception("Redis error performing rate-limit-pipeline on rate_limit_key"),
         call.exception("Redis error performing delete on delete_key"),

tests/notifications_utils/test_logging.py

@@ -62,5 +62,5 @@ def test_pii_filter():
         args=None,
     )
     pii_filter = logging.PIIFilter()
-    clean_msg = "phone1: 1XXXXX55555, phone2: 1XXXXX55554, email1: fakXXX@fake.goXXX, email2: fakXXX@fake2.fXXX"
+    clean_msg = "phone1: 1XXXXXXXXXX, phone2: 1XXXXXXXXXX, email1: XXXXX@XXXXXXX, email2: XXXXX@XXXXXXX"
     assert pii_filter.filter(record).msg == clean_msg