us → u.s.

tests/app/main/test_errorhandlers.py

@@ -10,7 +10,7 @@ def test_bad_url_returns_page_not_found(client_request):
         _expected_status=404,
     )
     assert page.h1.string.strip() == 'Page not found'
-    assert page.title.string.strip() == 'Page not found – US Notify'
+    assert page.title.string.strip() == 'Page not found – U.S. Notify'
 
 
 def test_load_service_before_request_handles_404(client_request, mocker):
@@ -37,7 +37,7 @@ def test_malformed_token_returns_page_not_found(client_request, url):
     assert page.h1.string.strip() == 'Page not found'
     flash_banner = page.find('div', class_='banner-dangerous').string.strip()
     assert flash_banner == "There’s something wrong with the link you’ve used."
-    assert page.title.string.strip() == 'Page not found – US Notify'
+    assert page.title.string.strip() == 'Page not found – U.S. Notify'
 
 
 def test_csrf_returns_400(client_request, mocker):
@@ -51,8 +51,8 @@ def test_csrf_returns_400(client_request, mocker):
         _test_page_title=False,
     )
 
-    assert page.h1.string.strip() == 'Sorry, there’s a problem with US Notify'
-    assert page.title.string.strip() == 'Sorry, there’s a problem with the service – US Notify'
+    assert page.h1.string.strip() == 'Sorry, there’s a problem with U.S. Notify'
+    assert page.title.string.strip() == 'Sorry, there’s a problem with the service – U.S. Notify'
 
 
 def test_csrf_redirects_to_sign_in_page_if_not_signed_in(client_request, mocker):
@@ -69,5 +69,5 @@ def test_csrf_redirects_to_sign_in_page_if_not_signed_in(client_request, mocker)
 def test_405_returns_something_went_wrong_page(client_request, mocker):
     page = client_request.post_url('/', _expected_status=405)
 
-    assert page.h1.string.strip() == 'Sorry, there’s a problem with US Notify'
-    assert page.title.string.strip() == 'Sorry, there’s a problem with the service – US Notify'
+    assert page.h1.string.strip() == 'Sorry, there’s a problem with U.S. Notify'
+    assert page.title.string.strip() == 'Sorry, there’s a problem with the service – U.S. Notify'

tests/app/main/views/organisations/test_organisations.py

@@ -86,7 +86,7 @@ def test_view_organisation_shows_the_correct_organisation(
 
     assert normalize_spaces(page.select_one('h1').text) == 'Usage'
     assert normalize_spaces(page.select_one('.govuk-hint').text) == (
-        'Test 1 has no live services on US Notify'
+        'Test 1 has no live services on U.S. Notify'
     )
     assert not page.select('a[download]')
 
@@ -1661,7 +1661,7 @@ def test_organisation_billing_page_when_the_agreement_is_signed_by_a_known_perso
     )
 
     assert page.h1.string == 'Billing'
-    assert '2.5 of the US Notify data sharing and financial agreement on 20 February 2020' in normalize_spaces(
+    assert '2.5 of the U.S. Notify data sharing and financial agreement on 20 February 2020' in normalize_spaces(
         page.text)
     assert f'{expected_signatory} signed' in page.text
     # assert page.select_one('main a')['href'] == url_for('.organisation_download_agreement', org_id=ORGANISATION_ID)
@@ -1683,7 +1683,7 @@ def test_organisation_billing_page_when_the_agreement_is_signed_by_an_unknown_pe
     )
 
     assert page.h1.string == 'Billing'
-    assert (f'{organisation_one["name"]} has accepted the US Notify data '
+    assert (f'{organisation_one["name"]} has accepted the U.S. Notify data '
             'sharing and financial agreement.') in page.text
     # assert page.select_one('main a')['href'] == url_for('.organisation_download_agreement', org_id=ORGANISATION_ID)
 
@@ -1716,11 +1716,11 @@ def test_organisation_billing_page_when_the_agreement_is_not_signed(
 @pytest.mark.parametrize('crown, expected_status, expected_file_fetched, expected_file_served', (
     # (
     #     True, 200, 'crown.pdf',
-    #     'US Notify data sharing and financial agreement.pdf',
+    #     'U.S. Notify data sharing and financial agreement.pdf',
     # ),
     # (
     #     False, 200, 'non-crown.pdf',
-    #     'US Notify data sharing and financial agreement (non-crown).pdf',
+    #     'U.S. Notify data sharing and financial agreement (non-crown).pdf',
     # ),
     (
         None, 404, None,

tests/app/main/views/service_settings/test_service_settings.py

@@ -3781,7 +3781,7 @@ def test_unknown_channel_404s(
     ),
     (
         'email',
-        'It’s free to send emails through US Notify.',
+        'It’s free to send emails through U.S. Notify.',
         'Send emails',
         [],
         'False',
@@ -3790,7 +3790,7 @@ def test_unknown_channel_404s(
     ),
     (
         'email',
-        'It’s free to send emails through US Notify.',
+        'It’s free to send emails through U.S. Notify.',
         'Send emails',
         ['email', 'sms', 'letter'],
         'True',

tests/app/main/views/test_add_service.py

@@ -141,7 +141,7 @@ def test_should_add_service_and_redirect_to_tour_when_no_services(
         'Example text message template',
         'sms',
         (
-            "Hi, I’m trying out US Notify. Today is "
+            "Hi, I’m trying out U.S. Notify. Today is "
             "((day of week)) and my favourite colour is ((colour))."
         ),
         101,

tests/app/main/views/test_agreement.py

@@ -116,11 +116,11 @@ def test_unknown_gps_and_trusts_are_redirected(
 @pytest.mark.parametrize('crown, expected_status, expected_file_fetched, expected_file_served', (
     # (
     #     True, 200, 'crown.pdf',
-    #     'US Notify data sharing and financial agreement.pdf',
+    #     'U.S. Notify data sharing and financial agreement.pdf',
     # ),
     # (
     #     False, 200, 'non-crown.pdf',
-    #     'US Notify data sharing and financial agreement (non-crown).pdf',
+    #     'U.S. Notify data sharing and financial agreement (non-crown).pdf',
     # ),
     (
         None, 404, None,
@@ -401,12 +401,12 @@ def test_accept_agreement_page_persists(
 @pytest.mark.parametrize('name, email, expected_paragraph', (
     (None, None, (
         'I confirm that I have the legal authority to accept the '
-        'US Notify data sharing and financial agreement (version '
+        'U.S. Notify data sharing and financial agreement (version '
         '1.2) and that Test Organisation will be bound by it.'
     )),
     ('Firstname Lastname', 'test@example.com', (
         'I confirm that I have the legal authority to accept the '
-        'US Notify data sharing and financial agreement (version '
+        'U.S. Notify data sharing and financial agreement (version '
         '1.2) on behalf of Firstname Lastname (test@example.com) and '
         'that Test Organisation will be bound by it.'
     )),

tests/app/main/views/test_api_integration.py

@@ -329,7 +329,7 @@ def test_should_show_confirm_revoke_api_key(
     )
     assert normalize_spaces(page.select('.banner-dangerous')[0].text) == (
         'Are you sure you want to revoke ‘some key name’? '
-        'You will not be able to use this API key to connect to US Notify. '
+        'You will not be able to use this API key to connect to U.S. Notify. '
         'Yes, revoke this API key'
     )
     assert mock_get_api_keys.call_args_list == [

tests/app/main/views/test_conversation.py

@@ -99,7 +99,7 @@ def test_view_conversation(
     )
 
     assert normalize_spaces(page.select_one('title').text) == (
-        'Received text message – service one – US Notify'
+        'Received text message – service one – U.S. Notify'
     )
     assert normalize_spaces(page.select_one('h1').text) == (
         '07123 456789'

tests/app/main/views/test_feedback.py

@@ -102,7 +102,7 @@ def test_get_support_as_someone_in_the_public_sector(
         _follow_redirects=True,
     )
     assert normalize_spaces(page.select('h1')) == (
-        'Contact US Notify support'
+        'Contact U.S. Notify support'
     )
     assert page.select_one('form textarea[name=feedback]')
     assert page.select_one('form input[name=name]')
@@ -120,7 +120,7 @@ def test_get_support_as_member_of_public(
         _follow_redirects=True,
     )
     assert normalize_spaces(page.select('h1')) == (
-        'The US Notify service is for people who work in the government'
+        'The U.S. Notify service is for people who work in the government'
     )
     assert len(page.select('h2 a')) == 3
     assert not page.select('form')
@@ -410,7 +410,7 @@ def test_redirects_to_triage(
 
 @pytest.mark.parametrize('ticket_type, expected_h1', (
     (PROBLEM_TICKET_TYPE, 'Report a problem'),
-    (GENERAL_TICKET_TYPE, 'Contact US Notify support'),
+    (GENERAL_TICKET_TYPE, 'Contact U.S. Notify support'),
 ))
 def test_options_on_triage_page(
     client_request,

tests/app/main/views/test_index.py

@@ -24,12 +24,12 @@ def test_non_logged_in_user_can_see_homepage(
     )
 
     assert page.select_one('meta[name=description]')['content'].strip() == (
-        'US Notify lets you send text messages and email '
+        'U.S. Notify lets you send text messages and email '
         'to your users. Try it now if you work in federal, state or local government.'
     )
 
     assert normalize_spaces(page.select_one('#whos-using-notify').text) == (
-        'Who’s using US Notify '
+        'Who’s using U.S. Notify '
         'There are 111 organizations and 9,999 services using Notify. '
         'See the list of services and organizations.'
     )
@@ -220,7 +220,7 @@ def test_old_integration_testing_page(
 def test_terms_page_has_correct_content(client_request):
     terms_page = client_request.get('main.terms')
     assert normalize_spaces(terms_page.select('main p')[0].text) == (
-        'These terms apply to your service’s use of US Notify. '
+        'These terms apply to your service’s use of U.S. Notify. '
         'You must be the service manager to accept them.'
     )
 

tests/app/main/views/test_jobs.py

@@ -234,7 +234,7 @@ def test_should_show_job_with_sending_limit_exceeded_status(
         "Notify cannot send these messages because you have reached your daily limit. You can only send 1,000 messages per day."  # noqa
     )
     assert normalize_spaces(page.select('main p')[2].text) == (
-        "Upload this spreadsheet again tomorrow or contact the US Notify team to raise the limit."
+        "Upload this spreadsheet again tomorrow or contact the U.S. Notify team to raise the limit."
     )
 
 

tests/app/main/views/test_template_folders.py

@@ -49,7 +49,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
     ),
     [
         (
-            'Templates – service one – US Notify',
+            'Templates – service one – U.S. Notify',
             'Templates',
             [],
             {},
@@ -111,7 +111,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             None,
         ),
         (
-            'Templates – service one – US Notify',
+            'Templates – service one – U.S. Notify',
             'Templates',
             [],
             {'template_type': 'all'},
@@ -169,7 +169,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             None,
         ),
         (
-            'Templates – service one – US Notify',
+            'Templates – service one – U.S. Notify',
             'Templates',
             [],
             {'template_type': 'sms'},
@@ -204,7 +204,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             None,
         ),
         (
-            'folder_one – Templates – service one – US Notify',
+            'folder_one – Templates – service one – U.S. Notify',
             'Templates folder_one',
             [{'template_type': 'all'}],
             {'template_folder_id': PARENT_FOLDER_ID},
@@ -236,7 +236,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             None,
         ),
         (
-            'folder_one – Templates – service one – US Notify',
+            'folder_one – Templates – service one – U.S. Notify',
             'Templates folder_one',
             [{'template_type': 'sms'}],
             {'template_type': 'sms', 'template_folder_id': PARENT_FOLDER_ID},
@@ -261,7 +261,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             None,
         ),
         (
-            'folder_one – Templates – service one – US Notify',
+            'folder_one – Templates – service one – U.S. Notify',
             'Templates folder_one',
             [{'template_type': 'email'}],
             {'template_type': 'email', 'template_folder_id': PARENT_FOLDER_ID},
@@ -272,7 +272,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             'There are no email templates in this folder',
         ),
         (
-            'folder_one_one – folder_one – Templates – service one – US Notify',
+            'folder_one_one – folder_one – Templates – service one – U.S. Notify',
             'Templates folder_one folder_one_one',
             [
                 {'template_type': 'all'},
@@ -299,7 +299,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             None,
         ),
         (
-            'folder_one_one_one – folder_one_one – folder_one – Templates – service one – US Notify',
+            'folder_one_one_one – folder_one_one – folder_one – Templates – service one – U.S. Notify',
             'Templates folder_one folder_one_one folder_one_one_one',
             [
                 {'template_type': 'all'},
@@ -320,7 +320,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             None,
         ),
         (
-            'folder_one_one_one – folder_one_one – folder_one – Templates – service one – US Notify',
+            'folder_one_one_one – folder_one_one – folder_one – Templates – service one – U.S. Notify',
             'Templates folder_one folder_one_one folder_one_one_one',
             [
                 {'template_type': 'email'},
@@ -338,7 +338,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             'There are no email templates in this folder',
         ),
         (
-            'folder_two – Templates – service one – US Notify',
+            'folder_two – Templates – service one – U.S. Notify',
             'Templates folder_two',
             [{'template_type': 'all'}],
             {'template_folder_id': FOLDER_TWO_ID},
@@ -349,7 +349,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             'This folder is empty',
         ),
         (
-            'folder_two – Templates – service one – US Notify',
+            'folder_two – Templates – service one – U.S. Notify',
             'Templates folder_two',
             [{'template_type': 'sms'}],
             {'template_folder_id': FOLDER_TWO_ID, 'template_type': 'sms'},
@@ -360,7 +360,7 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
             'This folder is empty',
         ),
         (
-            'folder_two – Templates – service one – US Notify',
+            'folder_two – Templates – service one – U.S. Notify',
             'Templates folder_two',
             [{'template_type': 'all'}],
             {'template_folder_id': FOLDER_TWO_ID, 'template_type': 'all'},
@@ -598,7 +598,7 @@ def test_get_manage_folder_page(
         _test_page_title=False,
     )
     assert normalize_spaces(page.select_one('title').text) == (
-        'folder_two – Templates – service one – US Notify'
+        'folder_two – Templates – service one – U.S. Notify'
     )
     assert page.select_one('input[name=name]')['value'] == 'folder_two'
     delete_link = page.find('a', string="Delete this folder")
@@ -633,7 +633,7 @@ def test_get_manage_folder_viewing_permissions_for_users(
         _test_page_title=False,
     )
     assert normalize_spaces(page.select_one('title').text) == (
-        'folder_two – Templates – service one – US Notify'
+        'folder_two – Templates – service one – U.S. Notify'
     )
     form_labels = page.select('legend.govuk-fieldset__legend')
     assert normalize_spaces(form_labels[0].text) == "Team members who can see this folder"
@@ -685,7 +685,7 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_when_no_man
         _test_page_title=False,
     )
     assert normalize_spaces(page.select_one('title').text) == (
-        'folder_two – Templates – service one – US Notify'
+        'folder_two – Templates – service one – U.S. Notify'
     )
     form_labels = page.select('legend[class=form-label]')
     assert len(form_labels) == 0
@@ -719,7 +719,7 @@ def test_get_manage_folder_viewing_permissions_for_users_not_visible_for_service
         _test_page_title=False,
     )
     assert normalize_spaces(page.select_one('title').text) == (
-        'folder_two – Templates – service one – US Notify'
+        'folder_two – Templates – service one – U.S. Notify'
     )
     form_labels = page.select('legend[class=form-label]')
     assert len(form_labels) == 0

tests/app/main/views/test_templates.py

@@ -555,7 +555,7 @@ def test_user_with_only_send_and_view_sees_letter_page(
         'Review your message'
     )
     assert normalize_spaces(page.select_one('title').text) == (
-        'Two week reminder – Templates – service one – US Notify'
+        'Two week reminder – Templates – service one – U.S. Notify'
     )
 
 
@@ -792,7 +792,7 @@ def test_should_be_able_to_view_a_template_with_links(
         'Review your message'
     )
     assert normalize_spaces(page.select_one('title').text) == (
-        'Two week reminder – Templates – service one – US Notify'
+        'Two week reminder – Templates – service one – U.S. Notify'
     )
 
     assert [

tests/app/main/views/test_webauthn_credentials.py

@@ -74,7 +74,7 @@ def test_begin_register_returns_encoded_options(
     assert user_options['id'] == bytes(platform_admin_user['id'], 'utf-8')
 
     relying_party_options = webauthn_options['rp']
-    assert relying_party_options['name'] == 'US Notify'
+    assert relying_party_options['name'] == 'U.S. Notify'
     assert relying_party_options['id'] == 'webauthn.io'
 
 

tests/javascripts/analytics/analytics.test.js

@@ -52,7 +52,7 @@ describe("Analytics", () => {
       expect(setUpArguments[1]).toEqual(['set', 'anonymizeIp', true]);
       expect(setUpArguments[2]).toEqual(['set', 'allowAdFeatures', false]);
       expect(setUpArguments[3]).toEqual(['set', 'transport', 'beacon']);
-      expect(setUpArguments[4]).toEqual(['set', 'title', 'US Notify']);
+      expect(setUpArguments[4]).toEqual(['set', 'title', 'U.S. Notify']);
 
     });