merges

tests/app/main/views/test_index.py

@@ -23,11 +23,7 @@ def test_non_logged_in_user_can_see_homepage(
         "main.sign_in",
     )
 
-    assert page.select_one("meta[name=description]")["content"].strip() == (
-        "Notify.gov lets you send text messages to your users. "
-        "Try it now if you work in federal, state, or local government."
-    )
-
+    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) == (
     #     'Who’s using Notify.gov '  # Hiding this next area for the pilot
@@ -114,7 +110,7 @@ def test_static_pages(
 
     # Check the page loads when user is signed in
     page = request()
-    assert not page.select_one("meta[name=description]")
+    assert page.select_one("meta[name=description]")
 
     # Check it still works when they don’t have a recent service
     with client_request.session_transaction() as session:

tests/app/main/views/test_new_password.py

@@ -5,8 +5,8 @@ import pytest
 from flask import url_for
 from freezegun import freeze_time
 from itsdangerous import SignatureExpired
-from notifications_utils.url_safe_token import generate_token
 
+from notifications_utils.url_safe_token import generate_token
 from tests.conftest import SERVICE_ONE_ID, url_for_endpoint_with_token
 
 

tests/app/main/views/test_send.py

@@ -12,11 +12,11 @@ from zipfile import BadZipFile
 import pytest
 from flask import url_for
 from notifications_python_client.errors import HTTPError
-from notifications_utils.recipients import RecipientCSV
-from notifications_utils.template import SMSPreviewTemplate
 from xlrd.biffh import XLRDError
 from xlrd.xldate import XLDateAmbiguous, XLDateError, XLDateNegative, XLDateTooLarge
 
+from notifications_utils.recipients import RecipientCSV
+from notifications_utils.template import SMSPreviewTemplate
 from tests import validate_route_permission, validate_route_permission_with_client
 from tests.conftest import (
     SERVICE_ONE_ID,

tests/app/main/views/test_user_profile.py

@@ -3,8 +3,8 @@ import uuid
 
 import pytest
 from flask import url_for
-from notifications_utils.url_safe_token import generate_token
 
+from notifications_utils.url_safe_token import generate_token
 from tests.conftest import (
     create_api_user_active,
     create_user,

tests/app/utils/test_templates.py

@@ -1,7 +1,7 @@
 import pytest
-from notifications_utils.template import Template
 
 from app.utils.templates import get_sample_template
+from notifications_utils.template import Template
 
 
 @pytest.mark.parametrize("template_type", ["sms", "email"])