merge from main

tests/app/db.py

@@ -83,7 +83,7 @@ def create_user(
     data = {
         "id": id_ or uuid.uuid4(),
         "name": name,
-        "email_address": email or f"{uuid.uuid4()}@digital.cabinet-office.gov.uk",
+        "email_address": email or f"{uuid.uuid4()}@test.gsa.gov",
         "password": "password",
         "mobile_number": mobile_number,
         "state": state,
@@ -141,7 +141,7 @@ def create_service(
             else service_name.lower().replace(" ", "."),
             created_by=user
             if user
-            else create_user(email=f"{uuid.uuid4()}@digital.cabinet-office.gov.uk"),
+            else create_user(email="{}@test.gsa.gov".format(uuid.uuid4())),
             prefix_sms=prefix_sms,
             organization_type=organization_type,
             organization=organization,

tests/app/organization/test_invite_rest.py

@@ -13,7 +13,7 @@ from tests.app.db import create_invited_org_user
 
 @pytest.mark.parametrize(
     "platform_admin, expected_invited_by",
-    ((True, "The GOV.UK Notify team"), (False, "Test User")),
+    ((True, "The Notify.gov team"), (False, "Test User")),
 )
 @pytest.mark.parametrize(
     "extra_args, expected_start_of_invite_url",