Merge branch 'main' of https://github.com/GSA/notifications-admin into notify-473

tests/app/main/views/test_index.py

@@ -233,7 +233,7 @@ def test_css_is_served_from_correct_path(client_request):
         page.select('link[rel=stylesheet]')
     ):
         assert link['href'].startswith([
-            'https://static.example.com/css/styles.css?',
+            # 'https://static.example.com/css/styles.css?',
             'https://static.example.com/stylesheets/main.css?',
             'https://static.example.com/stylesheets/print.css?',
         ][index])

tests/app/main/views/test_two_factor.py

@@ -367,7 +367,7 @@ def test_two_factor_sms_should_activate_pending_user(
 
 @pytest.mark.parametrize('extra_args, expected_encoded_next_arg', (
     ({}, ''),
-    ({'next': 'https://example.com'}, '?next=https%3A%2F%2Fexample.com')
+    ({'next': 'https://example.com'}, '?next=https://example.com')
 ))
 def test_valid_two_factor_email_link_shows_interstitial(
     client_request,